diff options
| -rw-r--r-- | searx/results.py | 31 | ||||
| -rw-r--r-- | searx/templates/simple/infobox.html | 8 | ||||
| -rw-r--r-- | searx/templates/simple/macros.html | 6 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/images.html | 6 |
4 files changed, 27 insertions, 24 deletions
diff --git a/searx/results.py b/searx/results.py index 2e81f5dc4..10a26aa3f 100644 --- a/searx/results.py +++ b/searx/results.py @@ -145,7 +145,8 @@ class ResultContainer: """docstring for ResultContainer""" __slots__ = '_merged_results', 'infoboxes', 'suggestions', 'answers', 'corrections', '_number_of_results',\ - '_closed', 'paging', 'unresponsive_engines', 'timings', 'redirect_url', 'engine_data', 'on_result' + '_closed', 'paging', 'unresponsive_engines', 'timings', 'redirect_url', 'engine_data', 'on_result',\ + '_lock' def __init__(self): super().__init__() @@ -162,6 +163,7 @@ class ResultContainer: self.timings = [] self.redirect_url = None self.on_result = lambda _: True + self._lock = RLock() def extend(self, engine_name, results): if self._closed: @@ -216,10 +218,11 @@ class ResultContainer: infobox['engines'] = set([infobox['engine']]) if infobox_id is not None: parsed_url_infobox_id = urlparse(infobox_id) - for existingIndex in self.infoboxes: - if compare_urls(urlparse(existingIndex.get('id', '')), parsed_url_infobox_id): - merge_two_infoboxes(existingIndex, infobox) - add_infobox = False + with self._lock: + for existingIndex in self.infoboxes: + if compare_urls(urlparse(existingIndex.get('id', '')), parsed_url_infobox_id): + merge_two_infoboxes(existingIndex, infobox) + add_infobox = False if add_infobox: self.infoboxes.append(infobox) @@ -262,14 +265,14 @@ class ResultContainer: def __merge_url_result(self, result, position): result['engines'] = set([result['engine']]) - duplicated = self.__find_duplicated_http_result(result) - if duplicated: - self.__merge_duplicated_http_result(duplicated, result, position) - return - - # if there is no duplicate found, append result - result['positions'] = [position] - with RLock(): + with self._lock: + duplicated = self.__find_duplicated_http_result(result) + if duplicated: + self.__merge_duplicated_http_result(duplicated, result, position) + return + + # if there is no duplicate found, append result + result['positions'] = [position] self._merged_results.append(result) def __find_duplicated_http_result(self, result): @@ -314,7 +317,7 @@ class ResultContainer: def __merge_result_no_url(self, result, position): result['engines'] = set([result['engine']]) result['positions'] = [position] - with RLock(): + with self._lock: self._merged_results.append(result) def close(self): diff --git a/searx/templates/simple/infobox.html b/searx/templates/simple/infobox.html index 56c51af77..24e0920b3 100644 --- a/searx/templates/simple/infobox.html +++ b/searx/templates/simple/infobox.html @@ -1,6 +1,6 @@ <aside class="infobox"> <h2><bdi>{{ infobox.infobox }}</bdi></h2> - {% if infobox.img_src %}<img src="{{ image_proxify(infobox.img_src) }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}" />{% endif %} + {% if infobox.img_src %}<img src="{{ image_proxify(infobox.img_src) }}" title="{{ infobox.infobox|striptags }}" alt="{{ infobox.infobox|striptags }}">{%- endif -%} <p><bdi>{{ infobox.content | safe }}</bdi></p> {% if infobox.attributes %} <div class="attributes"> @@ -8,15 +8,15 @@ <dl> <dt><bdi>{{ attribute.label }} :</bdi></dt> {%- if attribute.image -%} - <dd><img src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></dd> + <dd><img src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}"></dd> {%- else -%} <dd><bdi>{{ attribute.value }}</bdi></dd> {%- endif -%} </dl> - {% endfor %} + {% endfor %} </div> {% endif %} - + {% if infobox.urls %} <div class="urls"> <ul> diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html index 7a3a4ff9f..3920da2b3 100644 --- a/searx/templates/simple/macros.html +++ b/searx/templates/simple/macros.html @@ -1,6 +1,6 @@ <!-- Draw favicon --> {% macro draw_favicon(favicon) -%} - <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='themes/simple/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" /> + <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='themes/simple/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}"> {%- endmacro %} {% macro result_open_link(url, classes='') -%} @@ -23,8 +23,8 @@ <span class="url_o{{loop.index}}"><span class="url_i{{loop.index}}">{{- part -}}</span></span> {%- endfor %} {{- result_close_link() -}} - {%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="image" />{{ result_close_link() }}{% endif -%} - {%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{ result_close_link() }}{% endif -%} + {%- if result.img_src %}{{ result_open_link(result.url) }}<img class="image" src="{{ image_proxify(result.img_src) }}" title="{{ result.title|striptags }}">{{ result_close_link() }}{% endif -%} + {%- if result.thumbnail %}{{ result_open_link(result.url) }}<img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}">{{ result_close_link() }}{% endif -%} <h3>{{ result_link(result.url, result.title|safe) }}</h3> {%- endmacro -%} diff --git a/searx/templates/simple/result_templates/images.html b/searx/templates/simple/result_templates/images.html index 82cfcdde5..da7e34969 100644 --- a/searx/templates/simple/result_templates/images.html +++ b/searx/templates/simple/result_templates/images.html @@ -1,6 +1,6 @@ <article class="result result-images {% if result['category'] %}category-{{ result['category'] }}{% endif %}">{{- "" -}} <a {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} href="{{ result.img_src }}">{{- "" -}} - <img class="image_thumbnail" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" loading="lazy" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/>{{- "" -}} + <img class="image_thumbnail" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} src="{% if result.thumbnail_src %}{{ image_proxify(result.thumbnail_src) }}{% else %}{{ image_proxify(result.img_src) }}{% endif %}" loading="lazy" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}">{{- "" -}} <span class="title">{{ result.title|striptags }}</span>{{- "" -}} </a>{{- "" -}} <div class="detail">{{- "" -}} @@ -9,9 +9,9 @@ <a class="result-detail-next" href="#">{{ icon('chevron-right') }}</a>{{- "" -}} <a class="result-images-source" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %} href="{{ result.img_src }}"> {%- if result.thumbnail_src -%} - <img src="" data-src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}"> + <img src="" data-src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}"> {%- else -%} - <img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" loading="lazy"> + <img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" loading="lazy" title="{{ result.title|striptags }}"> {%- endif -%} </a>{{- "" -}} <div class="result-images-labels">{{- "" -}} |