From 90e160094da3c2f2f5aa522b65196b010f2e6516 Mon Sep 17 00:00:00 2001 From: jan Anja Date: Mon, 27 Jun 2022 23:30:41 +0500 Subject: [PATCH] Add more OpenSearch definitions (for images etc.) (#786) --- app/routes.py | 14 +++++++++++--- app/templates/display.html | 6 +++++- app/templates/opensearch.xml | 9 ++++++++- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/routes.py b/app/routes.py index d54aaf2..884dd06 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,7 +2,6 @@ import argparse import base64 import io import json -import os import pickle import urllib.parse as urlparse import uuid @@ -25,7 +24,7 @@ from app.utils.session import generate_user_key, valid_user_session from bs4 import BeautifulSoup as bsoup from flask import jsonify, make_response, request, redirect, render_template, \ send_file, session, url_for, g -from requests import exceptions, get +from requests import exceptions from requests.models import PreparedRequest from cryptography.fernet import Fernet, InvalidToken from cryptography.exceptions import InvalidSignature @@ -37,6 +36,12 @@ ac_var = 'WHOOGLE_AUTOCOMPLETE' autocomplete_enabled = os.getenv(ac_var, '1') +def get_search_name(tbm): + for tab in app.config['HEADER_TABS'].values(): + if tab['tbm'] == tbm: + return tab['name'] + + def auth_required(f): @wraps(f) def decorated(*args, **kwargs): @@ -259,7 +264,9 @@ def opensearch(): return render_template( 'opensearch.xml', main_url=opensearch_url, - request_type='' if get_only else 'method="post"' + request_type='' if get_only else 'method="post"', + search_type=request.args.get('tbm'), + search_name=get_search_name(request.args.get('tbm')) ), 200, {'Content-Type': 'application/xml'} @@ -375,6 +382,7 @@ def search(): has_update=app.config['HAS_UPDATE'], query=urlparse.unquote(query), search_type=search_util.search_type, + search_name=get_search_name(search_util.search_type), config=g.user_config, autocomplete_enabled=autocomplete_enabled, lingva_url=app.config['TRANSLATE_URL'], diff --git a/app/templates/display.html b/app/templates/display.html index e4eea3e..686fc2b 100644 --- a/app/templates/display.html +++ b/app/templates/display.html @@ -2,7 +2,11 @@ - + {% if not search_type %} + + {% else %} + + {% endif %} diff --git a/app/templates/opensearch.xml b/app/templates/opensearch.xml index 02c08e2..df421e3 100644 --- a/app/templates/opensearch.xml +++ b/app/templates/opensearch.xml @@ -1,7 +1,11 @@ - Whoogle + {% if not search_type %} + Whoogle + {% else %} + Whoogle {{ search_name }} + {% endif %} Whoogle: A lightweight, deployable Google search proxy for desktop/mobile that removes Javascript, AMP links, and ads UTF-8 @@ -10,6 +14,9 @@ + {% if search_type %} + + {% endif %}