From 1d5151215266d74085406604f99d8dec1c7cbe72 Mon Sep 17 00:00:00 2001 From: dalf Date: Sun, 18 Jan 2015 09:54:24 +0100 Subject: [PATCH] Proxify most of images references Create hash only when necessary --- searx/templates/courgette/result_templates/code.html | 4 ++-- searx/templates/courgette/result_templates/videos.html | 4 ++-- searx/templates/default/result_templates/code.html | 2 +- searx/templates/default/result_templates/default.html | 2 +- searx/templates/default/result_templates/map.html | 2 +- searx/templates/default/result_templates/videos.html | 2 +- searx/templates/oscar/result_templates/videos.html | 2 +- searx/webapp.py | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html index 444366b85..6721bd0fe 100644 --- a/searx/templates/courgette/result_templates/code.html +++ b/searx/templates/courgette/result_templates/code.html @@ -1,9 +1,9 @@

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}{% endif %} -

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

{% if result.repository %}

{{ result.repository }}

{% endif %} {{ result.codelines|code_highlighter(result.code_language)|safe }}

{{ result.pretty_url }}

-
\ No newline at end of file + diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index ebb7af4e4..891b69f28 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -5,6 +5,6 @@

{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}
{% endif %} - {{ result.title|striptags }} + {{ result.title|striptags }}

{{ result.pretty_url }}

- \ No newline at end of file + diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html index 616b7ea62..0aba4684d 100644 --- a/searx/templates/default/result_templates/code.html +++ b/searx/templates/default/result_templates/code.html @@ -2,7 +2,7 @@

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} -

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

{% if result.repository %}

{{ result.repository }}

{% endif %} {{ result.codelines|code_highlighter(result.code_language)|safe }} diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 79b00d8de..b7f9d3557 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -2,5 +2,5 @@

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

-

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index 59885a58c..159e472b5 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -8,6 +8,6 @@

{{ result.title|safe }}

{{ result.pretty_url }} cached {% if result.publishedDate %}{{ result.publishedDate }}{% endif %}

-

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index ef6a1f505..298799198 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,6 +1,6 @@

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}{{ result.publishedDate }}
{% endif %} - {{ result.title|striptags }} + {{ result.title|striptags }}

{{ result.url }}

diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index b9e6881da..2cf8b61df 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -15,7 +15,7 @@
- {{ result.title|striptags }} {{ result.engine }} + {{ result.title|striptags }} {{ result.engine }} {% if result.content %}

{{ result.content|safe }}

{% endif %}
diff --git a/searx/webapp.py b/searx/webapp.py index f88819846..e25156f40 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -214,11 +214,11 @@ def image_proxify(url): if url.startswith('//'): url = 'https:' + url - h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest() - if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'): return url + h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest() + return '{0}?{1}'.format(url_for('image_proxy'), urlencode(dict(url=url, h=h)))