Skip to content

armgit / mwmbl

Public Imported from GitHub
0

An open source, non-profit web search engine

Group results from the same domain in the search results page

Daoud Clarke7db0a0027880
diff --git a/devdata/index-v2.tinysearch b/devdata/index-v2.tinysearch
index a831301..490c48e 100644
Binary files a/devdata/index-v2.tinysearch and b/devdata/index-v2.tinysearch differ
diff --git a/front-end/assets/css/global.css b/front-end/assets/css/global.css
index b8441a3..9c1608f 100644
--- a/front-end/assets/css/global.css
+++ b/front-end/assets/css/global.css
@@ -120,6 +120,10 @@ body {
padding: 0;
}
+.result {
+ margin-bottom: 35px;
+}
+
.result.expanded {
min-height: 120px;
}
@@ -256,8 +260,8 @@ a {
.result-container .button {
background-color: var(--dark-gray-color);
color: white;
- padding: 5px 10px;
- margin: 0 10px 0 0;
+ padding: 8px;
+ margin: 3px 10px 0 0;
width: 18px;
height: 18px;
display: flex;
@@ -267,6 +271,35 @@ a {
font-weight: bolder;
}
+.result-link-more {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ min-width: 0;
+}
+
+.result-link-more a.more {
+ font-weight: var(--regular-font);
+}
+
+.result-link-more a.more {
+ font-weight: var(--regular-font);
+}
+
+.result-link-more a.more .more-title {
+ font-weight: var(--bold-font-weight);
+ color: var(--primary-color);
+}
+
+.result-link-more a.more .more-title strong {
+ font-weight: 900;
+ color: var(--primary-color);
+}
+
+.first-result {
+ padding-bottom: 10px;
+}
+
.validated {
background-color: green !important;
}
diff --git a/mwmbl/templates/home.html b/mwmbl/templates/home.html
index 682f8f6..4f15aed 100644
--- a/mwmbl/templates/home.html
+++ b/mwmbl/templates/home.html
@@ -32,7 +32,7 @@ For recent crawling activity see <a href="/stats">stats</a>.</p>
{% endif %}
{% if results %}
<ul class='results'>
- {% for result in results %}
+ {% for domain, domain_results in results.items %}
{% include "result.html" %}
{% endfor %}
</ul>
diff --git a/mwmbl/templates/result.html b/mwmbl/templates/result.html
index 22a9723..9c9a0bc 100644
--- a/mwmbl/templates/result.html
+++ b/mwmbl/templates/result.html
@@ -1,11 +1,12 @@
{% load result_filters %}
-<li is="mwmbl-result" class="result {% if result.compact %}compact{% else %}expanded{% endif %}">
+<li is="mwmbl-result" class="result">
+ {% for result in domain_results %}
<input type="hidden" name="url" value="{{result.url}}" />
<input type="hidden" name="title" value="{{result.title}}" />
<input type="hidden" name="extract" value="{{result.extract}}" />
<input type="hidden" name="score" value="{{result.score}}" />
<input type="hidden" name="state" value="{{result.state.value}}" />
- <div class="result-container">
+ <div class="result-container{% if forloop.counter == 1 and domain_results|length > 1 %} first-result{% endif %}">
{% if user.is_authenticated %}
<button class="button curate-approve{% if result.state >= 7 %} validated{% endif %}"
hx-post="/app/approve/"
@@ -13,16 +14,20 @@
hx-include=".result,[name='csrfmiddlewaretoken']"
hx-vals='{"approve_url": "{{ result.url }}", "query": "{{ query }}"{% if curation %}, "curation_id": {{ curation.id }}{% endif %}}'>✓</button>
{% endif %}
- <div class="result-link">
- <a href="{{result.url}}">
- {% if not result.compact %}
- <p><span class='link'>{{result.url}}</span> <span class="via">— found via <span class="source">{{result.state|convert_state_to_source|title}}</span></span></p>
- {% endif %}
- <p class='title'>{{result.title|format_for_query:query}}</p>
- </a>
- {% if not result.compact %}
- <p class='extract'>{{result.extract|format_for_query:query}}</p>
+ {% if forloop.counter == 1 %}
+ <div class="result-link">
+ <a href="{{result.url}}">
+ <p><span class='link'>{{result.url}}</span> <span class="via">— found via <span class="source">{{result.state|convert_state_to_source|title}}</span></span></p>
+ <p class='title'>{{result.title|format_for_query:query}}</p>
+ </a>
+ <p class='extract'>{{result.extract|format_for_query:query}}</p>
+ </div>
+ {% else %}
+ <div class="result-link-more">
+ <a href="{{result.url}}" class="more"><span class="more-title">{{result.title|format_for_query:query}}</span>
+ <span class="more-extract">{{ result.extract|format_for_query:query }}</span></a>
+ </div>
{% endif %}
- </div>
</div>
+{% endfor %}
</li>
diff --git a/mwmbl/views.py b/mwmbl/views.py
index df84dec..5107ed3 100644
--- a/mwmbl/views.py
+++ b/mwmbl/views.py
@@ -64,34 +64,20 @@ def justext_with_dom(html_text, stoplist, length_low=LENGTH_LOW_DEFAULT,
return paragraphs, title
-def _prepare_results(results: list[Document]) -> list[dict[str, Any]]:
+class Optionallist:
+ pass
+
+
+def _prepare_results(results: Optional[list[Document]]) -> Optional[dict[str, list[Document]]]:
+ if results is None:
+ return None
+
grouped_domain_results = defaultdict(list)
for result in results:
domain = parse_url(result.url).netloc
grouped_domain_results[domain].append(result)
- rearranged_results = []
- for domain, domain_results in grouped_domain_results.items():
- result = domain_results[0]
- rearranged_results.append({
- "title": result.title,
- "url": result.url,
- "extract": result.extract,
- "score": result.score,
- "state": result.state,
- "compact": False,
- })
-
- for result in domain_results[1:]:
- rearranged_results.append({
- "title": result.title,
- "url": result.url,
- "extract": result.extract,
- "score": result.score,
- "state": result.state,
- "compact": True,
- })
- return rearranged_results
+ return dict(grouped_domain_results)
def index(request):