simplesitesearch 0.0.4__tar.gz → 0.0.6__tar.gz

{simplesitesearch-0.0.4/simplesitesearch.egg-info → simplesitesearch-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplesitesearch
-Version: 0.0.4
+Version: 0.0.6
 Summary: Reptile Simple Site Search django app
 Home-page: https://github.com/FlavienLouis/simplesitesearch
 Author: Reptile Tech
@@ -285,6 +285,16 @@ For support and questions, please open an issue on the [GitHub repository](https
 
 ## Changelog
 
+### 0.0.6
+- **Changed** search results: API hits normalized for templates (`display_title`, `snippet`, domain/type/language/tags/date metadata); highlighted title when available.
+- **Changed** templates: `{% load static %}` instead of deprecated `staticfiles` (Django 4+).
+
+### 0.0.5
+- **Fixed** tag parsing: single tag string (e.g. `Hometag`) no longer sent as `H,o,m,e,t,a,g`; string is treated as one tag. API URL keeps commas unencoded so multiple tags parse correctly.
+
+### 0.0.4
+- SSL verification configurable via `SITE_SEARCH_VERIFY_SSL` (default `True`).
+
 ### 0.0.3
 - Added `simplesitesearch.utils` QOL helpers: `get_search_results`, `get_search_api_url`, `build_search_query_string`, `parse_comma_separated_tags`, `normalize_search_term`, `safe_int`
 - Tag filter: `tag` (or `tags`) query parameter forwarded to API as comma-separated `tags`; pagination links preserve tags

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/README.md

@@ -239,6 +239,16 @@ For support and questions, please open an issue on the [GitHub repository](https
 
 ## Changelog
 
+### 0.0.6
+- **Changed** search results: API hits normalized for templates (`display_title`, `snippet`, domain/type/language/tags/date metadata); highlighted title when available.
+- **Changed** templates: `{% load static %}` instead of deprecated `staticfiles` (Django 4+).
+
+### 0.0.5
+- **Fixed** tag parsing: single tag string (e.g. `Hometag`) no longer sent as `H,o,m,e,t,a,g`; string is treated as one tag. API URL keeps commas unencoded so multiple tags parse correctly.
+
+### 0.0.4
+- SSL verification configurable via `SITE_SEARCH_VERIFY_SSL` (default `True`).
+
 ### 0.0.3
 - Added `simplesitesearch.utils` QOL helpers: `get_search_results`, `get_search_api_url`, `build_search_query_string`, `parse_comma_separated_tags`, `normalize_search_term`, `safe_int`
 - Tag filter: `tag` (or `tags`) query parameter forwarded to API as comma-separated `tags`; pagination links preserve tags

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simplesitesearch"
-version = "0.0.4"
+version = "0.0.6"
 description = "Reptile Simple Site Search django app"
 readme = "README.md"
 license = {text = "MIT"}

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = simplesitesearch
-version = 0.0.4
+version = 0.0.6
 author = Reptile Tech
 author_email = flouis@reptile.tech
 description = Reptile Simple Site Search django app

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/setup.py

@@ -8,7 +8,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="simplesitesearch",
-    version="0.0.4",
+    version="0.0.6",
     author="Reptile Tech",
     author_email="flouis@reptile.tech",
     description="Reptile Simple Site Search django app",

simplesitesearch-0.0.6/simplesitesearch/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.0.6"

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/simplesitesearch/templates/simplesitesearch/pagination.html

@@ -1,4 +1,4 @@
-{% load i18n staticfiles cms_tags %}
+{% load i18n static cms_tags %}
 
 <div class="search__pagination d-flex justify-content-between justify-sm-content-center align-items-center">
     <div class="search__pagination__nav search__pagination__nav--prev">

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/simplesitesearch/templates/simplesitesearch/search_results.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n staticfiles cms_tags %}
+{% load i18n static cms_tags %}
 
 {% block template_class %}template_search{% endblock %}
 
@@ -27,13 +27,29 @@
             {% for result in results %}
             <div class="search__content__result">
                 <div class="headings__third-container">
-                    <a class="headings headings__third headings--blue" href="{{result.url}}">{{ result.title|safe }}</a>
+                    <a class="headings headings__third headings--blue" href="{{ result.url }}">{{ result.display_title|safe }}</a>
                 </div>
+                {% if result.snippet %}
                 <div class="text-container">
                     <div class="text text--graydark">
-                        <p>{{result.highlight|safe}}...</p>
+                        <p>{{ result.snippet|safe }}…</p>
                     </div>
                 </div>
+                {% endif %}
+                {% if result.domain or result.type or result.language or result.last_modified %}
+                <div class="text-container">
+                    <div class="text text--graydark">
+                        <p>{% if result.domain %}{{ result.domain }}{% endif %}{% if result.type %}{% if result.domain %} · {% endif %}{{ result.type }}{% endif %}{% if result.language %}{% if result.domain or result.type %} · {% endif %}{{ result.language }}{% endif %}{% if result.last_modified %}{% if result.domain or result.type or result.language %} · {% endif %}{{ result.last_modified|date:"SHORT_DATETIME_FORMAT" }}{% endif %}</p>
+                    </div>
+                </div>
+                {% endif %}
+                {% if result.tags %}
+                <div class="text-container">
+                    <div class="text text--graydark">
+                        <p>{% for t in result.tags %}{{ t }}{% if not forloop.last %}, {% endif %}{% endfor %}</p>
+                    </div>
+                </div>
+                {% endif %}
             </div>
             {% empty %}
             <div class="search__content--empty">

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/simplesitesearch/utils.py

@@ -35,11 +35,16 @@ def tags_to_query_value(tags):
     Convert a list of tags to a comma-separated string for query params or API.
 
     Args:
-        tags: Iterable of tag strings.
+        tags: Iterable of tag strings, or a single tag string (e.g. "Hometag").
+              A string is treated as one tag, not iterated by character.
 
     Returns:
         Comma-separated string, or None if tags is empty.
     """
+    if not tags:
+        return None
+    if isinstance(tags, str):
+        tags = [tags.strip()] if tags.strip() else []
     if not tags:
         return None
     return ",".join(str(t).strip() for t in tags if str(t).strip())
@@ -128,7 +133,8 @@ def get_search_api_url(term, current_page, tags=None):
     )
     tag_value = tags_to_query_value(tags)
     if tag_value:
-        url += "&tags=%s" % quote_plus(tag_value)
+        # Keep commas unencoded so the API can split tags (e.g. tags=Home,tag)
+        url += "&tags=%s" % quote_plus(tag_value, safe=",")
     return url
 
 

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6}/simplesitesearch/views.py

@@ -1,5 +1,6 @@
 from math import floor
 
+from django.utils.dateparse import parse_datetime
 from django.views.generic import TemplateView
 
 from .utils import (
@@ -59,6 +60,46 @@ def get_total_pages(total_hits):
     return pages_count
 
 
+def _optional_datetime(value):
+    if not value or not isinstance(value, str):
+        return None
+    return parse_datetime(value)
+
+
+def normalize_search_hit(hit):
+    """
+    Reduce each API hit to fields useful for templates (omit bulky nested blobs).
+    """
+    if not isinstance(hit, dict):
+        return hit
+
+    highlights = hit.get("highlights") or {}
+    title_highlight = None
+    title_snippets = highlights.get("title")
+    if title_snippets and isinstance(title_snippets, list) and title_snippets[0]:
+        title_highlight = title_snippets[0]
+
+    snippet = (
+        hit.get("highlight")
+        or hit.get("description")
+        or hit.get("content_preview")
+        or ""
+    )
+
+    modified_raw = hit.get("last_modified") or hit.get("indexed_at") or ""
+
+    return {
+        "url": hit.get("url") or "",
+        "display_title": title_highlight or hit.get("title") or "",
+        "snippet": snippet,
+        "domain": hit.get("domain") or "",
+        "type": hit.get("type") or "",
+        "tags": hit.get("tags") if isinstance(hit.get("tags"), list) else [],
+        "language": hit.get("language") or "",
+        "last_modified": _optional_datetime(modified_raw),
+    }
+
+
 def get_api_re_path(term, current_page, tags=None):
     """Build the search API URL (delegates to utils for consistency)."""
     return get_search_api_url(term, current_page, tags=tags)
@@ -84,21 +125,23 @@ class SearchResult(TemplateView):
             response_data = get_search_results(
                 term, current_page, tags=tags_list or None
             )
-            pages_count = get_total_pages(response_data["total_hits"])
+            total_hits = response_data.get("total_hits", 0)
+            pages_count = get_total_pages(total_hits)
             prev_page_number, next_page_number = get_prev_next_page_number(pages_count, current_page)
             prev_link, next_link = get_prev_next_links(
                 next_page_number, prev_page_number, term, tags=tags_list or None
             )
             page_links = get_page_links(pages_count, current_page, term, tags=tags_list or None)
 
+            raw_hits = response_data.get("hits") or []
             context.update({
                 "pages_count": pages_count,
                 "current_page": current_page,
-                "results_count": response_data["total_hits"],
+                "results_count": total_hits,
                 "prev_link": prev_link,
                 "next_link": next_link,
                 "page_links": page_links,
-                "results": response_data["hits"],
+                "results": [normalize_search_hit(h) for h in raw_hits],
             })
         else:
             context.update({"results": None})

{simplesitesearch-0.0.4 → simplesitesearch-0.0.6/simplesitesearch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplesitesearch
-Version: 0.0.4
+Version: 0.0.6
 Summary: Reptile Simple Site Search django app
 Home-page: https://github.com/FlavienLouis/simplesitesearch
 Author: Reptile Tech
@@ -285,6 +285,16 @@ For support and questions, please open an issue on the [GitHub repository](https
 
 ## Changelog
 
+### 0.0.6
+- **Changed** search results: API hits normalized for templates (`display_title`, `snippet`, domain/type/language/tags/date metadata); highlighted title when available.
+- **Changed** templates: `{% load static %}` instead of deprecated `staticfiles` (Django 4+).
+
+### 0.0.5
+- **Fixed** tag parsing: single tag string (e.g. `Hometag`) no longer sent as `H,o,m,e,t,a,g`; string is treated as one tag. API URL keeps commas unencoded so multiple tags parse correctly.
+
+### 0.0.4
+- SSL verification configurable via `SITE_SEARCH_VERIFY_SSL` (default `True`).
+
 ### 0.0.3
 - Added `simplesitesearch.utils` QOL helpers: `get_search_results`, `get_search_api_url`, `build_search_query_string`, `parse_comma_separated_tags`, `normalize_search_term`, `safe_int`
 - Tag filter: `tag` (or `tags`) query parameter forwarded to API as comma-separated `tags`; pagination links preserve tags

simplesitesearch-0.0.4/simplesitesearch/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.0.4"