Icycoide/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng.git synced 2025-07-22 12:49:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] better result template handling

Browse source
This commit is contained in:
Adam Tauber 2015-01-01 18:59:53 +01:00
parent 20c4de8f06
commit 2f9a386c0d
5 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
searx/webapp.py
View file

@ -39,7 +39,7 @@ from searx.engines import (
)
from searx.utils import (
UnicodeWriter, highlight_content, html_to_text, get_themes,
get_static_files
get_static_files, get_result_templates
)
from searx.version import VERSION_STRING
from searx.languages import language_codes
@ -58,6 +58,8 @@ default_theme = settings['server'].get('default_theme', 'default')
static_files = get_static_files(searx_dir)
result_templates = get_result_templates(searx_dir)
app = Flask(
__name__,
static_folder=static_path,
@ -125,6 +127,13 @@ def get_current_theme_name(override=None):
return theme_name
def get_result_template(theme, template_name):
themed_path = theme + '/result_templates/' + template_name
if themed_path in result_templates:
return themed_path
return 'result_templates/' + template_name
def url_for_theme(endpoint, override_theme=None, **values):
if endpoint == 'static' and values.get('filename'):
theme_name = get_current_theme_name(override=override_theme)
@ -180,6 +189,8 @@ def render(template_name, override_theme=None, **kwargs):
# override url_for function in templates
kwargs['url_for'] = url_for_theme
kwargs['get_result_template'] = get_result_template
kwargs['theme'] = get_current_theme_name(override=override_theme)
kwargs['template_name'] = template_name