infrastructure/extensions-website
4
8
Fork 10
Code Issues 20 Pull Requests 2 Projects Releases Wiki Activity

Full-text search using postgresql #162

Merged
Oleg-Komarov merged 10 commits from fts into main 2024-06-03 20:07:23 +02:00
Conversation 0 Commits 10 Files Changed 2 +19 -10
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ff68c4b3e - Show all commits

1
blender_extensions/settings.py
View File

@ -75,6 +75,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.flatpages', 'django.contrib.flatpages',
'django.contrib.humanize', 'django.contrib.humanize',
'django.contrib.postgres',
'actstream', 'actstream',
] ]

28
extensions/views/public.py
View File

@ -1,6 +1,8 @@
import logging import logging
from django.conf import settings
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.postgres.search import SearchQuery, SearchVector
from django.db.models import Q from django.db.models import Q
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.views.generic.list import ListView from django.views.generic.list import ListView
@ -89,16 +91,22 @@ class SearchView(ListedExtensionsView):
_type = self._get_type_id_by_slug() _type = self._get_type_id_by_slug()
queryset = queryset.filter(type=_type) queryset = queryset.filter(type=_type)
if 'q' in self.request.GET: if 'q' in self.request.GET:
qs = self.request.GET['q'].split() # using DEBUG as a shortcut for checking if we run on postgres vs sqlite
search_query = Q() if settings.DEBUG:
for token in qs: qs = self.request.GET['q'].split()
search_query &= ( search_query = Q()
Q(slug__icontains=token) for token in qs:
| Q(name__icontains=token) search_query &= (
| Q(description__icontains=token) Q(slug__icontains=token)
| Q(latest_version__tags__name__icontains=token) | Q(name__icontains=token)
) | Q(description__icontains=token)
queryset = queryset.filter(search_query).distinct() | Q(latest_version__tags__name__icontains=token)
)
queryset = queryset.filter(search_query).distinct()
else:
query = SearchQuery(self.request.GET['q'], search_type='websearch')
vector = SearchVector('slug', 'name', 'description', 'latest_version__tags__name')
queryset = queryset.annotate(search=vector).filter(search=query).distinct()
return queryset.prefetch_related( return queryset.prefetch_related(
'authors', 'authors',
'latest_version__file', 'latest_version__file',