c9c39b3 · searx · git.iko.soy

on master help sign in

add engine's name in infobox's header

c9c39b3Marc Abonce Seguin6 years ago

searx/results.py+3

@@ -60,6 +60,8 @@ def merge_two_infoboxes(infobox1, infobox2):

60 if weight2 > weight1:

61 infobox1['engine'] = infobox2['engine']

63+ infobox1['engines'] |= infobox2['engines']

64+

63 if 'urls' in infobox2:

65 if 'urls' in infobox2:

64 urls1 = infobox1.get('urls', None)

66 urls1 = infobox1.get('urls', None)

65 if urls1 is None:

67 if urls1 is None:

@@ -189,6 +191,7 @@ class ResultContainer(object):

189 def _merge_infobox(self, infobox):

191 def _merge_infobox(self, infobox):

190 add_infobox = True

192 add_infobox = True

191 infobox_id = infobox.get('id', None)

193 infobox_id = infobox.get('id', None)

194+ infobox['engines'] = set([infobox['engine']])

192 if infobox_id is not None:

195 if infobox_id is not None:

193 parsed_url_infobox_id = urlparse(infobox_id)

196 parsed_url_infobox_id = urlparse(infobox_id)

194 for existingIndex in self.infoboxes:

197 for existingIndex in self.infoboxes:

searx/templates/oscar/infobox.html+5

@@ -2,6 +2,11 @@

2<div class="panel panel-default infobox">

3 <div class="panel-heading">{{- "" -}}

4 <div class="infobox_part">

5+ <div class="{% if not rtl %}pull-right{% endif %}">

6+ {% for engine in infobox.engines %}

7+ <span class="label label-default">{{ engine }}</span>

8+ {% endfor %}

9+ </div>

5 <h4 class="panel-title"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}}

10 <h4 class="panel-title"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}}

6 {% for u in infobox.urls %}{% if u.official %} <a href="{{ u.url }}">{{ u.domain }}</a>{% endif %}{% endfor %}

11 {% for u in infobox.urls %}{% if u.official %} <a href="{{ u.url }}">{{ u.domain }}</a>{% endif %}{% endfor %}

7 </div>

12 </div>