mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-23 18:11:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1231 from bookwyrm-social/search-remote

Browse source 
Automatically search remote endpoints if a local search is empty
This commit is contained in:
Mouse Reeve 2021-08-02 13:30:12 -06:00 committed by GitHub
commit acab222f8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bookwyrm/views/search.py
View file

@ -53,7 +53,7 @@ class Search(View):
"remote": search_remote, "remote": search_remote,
} }
if query: if query:
results = endpoints[search_type]( results, search_remote = endpoints[search_type](
query, request.user, min_confidence, search_remote query, request.user, min_confidence, search_remote
) )
if results: if results:
@ -61,25 +61,28 @@ class Search(View):
request.GET.get("page") request.GET.get("page")
) )
data["results"] = paginated data["results"] = paginated
data["remote"] = search_remote
return TemplateResponse(request, "search/{:s}.html".format(search_type), data) return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
def book_search(query, _, min_confidence, search_remote=False): def book_search(query, _, min_confidence, search_remote=False):
"""the real business is elsewhere""" """the real business is elsewhere"""
if search_remote: # try a local-only search
return connector_manager.search(query, min_confidence=min_confidence) if not search_remote:
results = connector_manager.local_search(query, min_confidence=min_confidence) results = connector_manager.local_search(query, min_confidence=min_confidence)
if not results: if results:
return None # gret, we found something
return [{"results": results}] return [{"results": results}], False
# if there weere no local results, or the request was for remote, search all sources
return connector_manager.search(query, min_confidence=min_confidence), True
def user_search(query, viewer, *_): def user_search(query, viewer, *_):
"""cool kids members only user search""" """cool kids members only user search"""
# logged out viewers can't search users # logged out viewers can't search users
if not viewer.is_authenticated: if not viewer.is_authenticated:
return models.User.objects.none() return models.User.objects.none(), None
# use webfinger for mastodon style account@domain.com username to load the user if # use webfinger for mastodon style account@domain.com username to load the user if
# they don't exist locally (handle_remote_webfinger will check the db) # they don't exist locally (handle_remote_webfinger will check the db)
@ -98,7 +101,7 @@ def user_search(query, viewer, *_):
similarity__gt=0.5, similarity__gt=0.5,
) )
.order_by("-similarity")[:10] .order_by("-similarity")[:10]
) ), None
def list_search(query, viewer, *_): def list_search(query, viewer, *_):
@ -119,4 +122,4 @@ def list_search(query, viewer, *_):
similarity__gt=0.1, similarity__gt=0.1,
) )
.order_by("-similarity")[:10] .order_by("-similarity")[:10]
) ), None