mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-04 22:38:43 +00:00
Code Issues Projects Releases Wiki Activity

Updates other calls to the search endpoint

Browse source
This commit is contained in:
Mouse Reeve 2021-09-16 10:55:23 -07:00
parent 98325818b2
commit 0d5e05a3c2
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bookwyrm/views/get_started.py
View file

@ -11,8 +11,7 @@ from django.template.response import TemplateResponse
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.views import View from django.views import View
from bookwyrm import forms, models from bookwyrm import book_search, forms, models
from bookwyrm.connectors import connector_manager
from bookwyrm.suggested_users import suggested_users from bookwyrm.suggested_users import suggested_users
from .edit_user import save_user_form from .edit_user import save_user_form
@ -55,7 +54,7 @@ class GetStartedBooks(View):
query = request.GET.get("query") query = request.GET.get("query")
book_results = popular_books = [] book_results = popular_books = []
if query: if query:
book_results = connector_manager.local_search(query, raw=True)[:5] book_results = book_search.search(query)[:5]
if len(book_results) < 5: if len(book_results) < 5:
popular_books = ( popular_books = (
models.Edition.objects.exclude( models.Edition.objects.exclude(

4
bookwyrm/views/isbn.py
View file

@ -4,7 +4,7 @@ from django.http import JsonResponse
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.views import View from django.views import View
from bookwyrm.connectors import connector_manager from bookwyrm import book_search
from bookwyrm.settings import PAGE_LENGTH from bookwyrm.settings import PAGE_LENGTH
from .helpers import is_api_request from .helpers import is_api_request
@ -14,7 +14,7 @@ class Isbn(View):
def get(self, request, isbn): def get(self, request, isbn):
"""info about a book""" """info about a book"""
book_results = connector_manager.isbn_local_search(isbn) book_results = book_search.isbn_search(isbn)
if is_api_request(request): if is_api_request(request):
return JsonResponse([r.json() for r in book_results], safe=False) return JsonResponse([r.json() for r in book_results], safe=False)

6
bookwyrm/views/list.py
View file

@ -16,9 +16,8 @@ from django.utils.decorators import method_decorator
from django.views import View from django.views import View
from django.views.decorators.http import require_POST from django.views.decorators.http import require_POST
from bookwyrm import forms, models from bookwyrm import book_search, forms, models
from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.activitypub import ActivitypubResponse
from bookwyrm.connectors import connector_manager
from bookwyrm.settings import PAGE_LENGTH from bookwyrm.settings import PAGE_LENGTH
from .helpers import is_api_request, privacy_filter from .helpers import is_api_request, privacy_filter
from .helpers import get_user_from_username from .helpers import get_user_from_username
@ -150,9 +149,8 @@ class List(View):
if query and request.user.is_authenticated: if query and request.user.is_authenticated:
# search for books # search for books
suggestions = connector_manager.local_search( suggestions = book_search.search(
query, query,
raw=True,
filters=[~Q(parent_work__editions__in=book_list.books.all())], filters=[~Q(parent_work__editions__in=book_list.books.all())],
) )
elif request.user.is_authenticated: elif request.user.is_authenticated: