logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: 8de97dac03fc97a9705c8d3cd3163330a6f08375
parent: bac98a02cbca8083c1dfcaf54c55be2bcfb0576b
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Thu, 29 Jan 2015 19:44:52 +0100

[mod] pretty url separation

Diffstat:

searx/utils.py | 7+++++++
searx/webapp.py | 9+++------
2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/searx/utils.py b/searx/utils.py @@ -218,3 +218,10 @@ def dict_subset(d, properties): if k in d: result[k] = d[k] return result + + +def prettify_url(url): + if len(url) > 74: + return u'{0}[...]{1}'.format(url[:35], url[-35:]) + else: + return url diff --git a/searx/webapp.py b/searx/webapp.py @@ -42,7 +42,8 @@ from searx.engines import ( ) from searx.utils import ( UnicodeWriter, highlight_content, html_to_text, get_themes, - get_static_files, get_result_templates, gen_useragent, dict_subset + get_static_files, get_result_templates, gen_useragent, dict_subset, + prettify_url ) from searx.version import VERSION_STRING from searx.languages import language_codes @@ -330,11 +331,7 @@ def index(): result['title'] = ' '.join(html_to_text(result['title']) .strip().split()) - if len(result['url']) > 74: - url_parts = result['url'][:35], result['url'][-35:] - result['pretty_url'] = u'{0}[...]{1}'.format(*url_parts) - else: - result['pretty_url'] = result['url'] + result['pretty_url'] = prettify_url(result['url']) # TODO, check if timezone is calculated right if 'publishedDate' in result: