mirror of
https://github.com/sissbruecker/linkding
synced 2024-11-12 23:07:06 +00:00
048a8b1162
* changed query on tag search for speedup related to issues #112 and #141 * fix tests and only conditionally append tag filter * add bookmark tags query tests * reuse bookmark queries for tag queries * fix tag query test setup Co-authored-by: Sascha Ißbrücker <sascha.issbruecker@googlemail.com>
100 lines
2.9 KiB
Python
100 lines
2.9 KiB
Python
from django.contrib.auth.models import User
|
|
from django.db.models import Q, Count, Aggregate, CharField, Value, BooleanField, QuerySet
|
|
|
|
from bookmarks.models import Bookmark, Tag
|
|
from bookmarks.utils import unique
|
|
|
|
|
|
class Concat(Aggregate):
|
|
function = 'GROUP_CONCAT'
|
|
template = '%(function)s(%(distinct)s%(expressions)s)'
|
|
|
|
def __init__(self, expression, distinct=False, **extra):
|
|
super(Concat, self).__init__(
|
|
expression,
|
|
distinct='DISTINCT ' if distinct else '',
|
|
output_field=CharField(),
|
|
**extra)
|
|
|
|
|
|
def query_bookmarks(user: User, query_string: str) -> QuerySet:
|
|
return _base_bookmarks_query(user, query_string) \
|
|
.filter(is_archived=False)
|
|
|
|
|
|
def query_archived_bookmarks(user: User, query_string: str) -> QuerySet:
|
|
return _base_bookmarks_query(user, query_string) \
|
|
.filter(is_archived=True)
|
|
|
|
|
|
def _base_bookmarks_query(user: User, query_string: str) -> QuerySet:
|
|
# Add aggregated tag info to bookmark instances
|
|
query_set = Bookmark.objects \
|
|
.annotate(tag_count=Count('tags'),
|
|
tag_string=Concat('tags__name'),
|
|
tag_projection=Value(True, BooleanField()))
|
|
|
|
# Filter for user
|
|
query_set = query_set.filter(owner=user)
|
|
|
|
# Split query into search terms and tags
|
|
query = _parse_query_string(query_string)
|
|
|
|
# Filter for search terms and tags
|
|
for term in query['search_terms']:
|
|
query_set = query_set.filter(
|
|
Q(title__contains=term)
|
|
| Q(description__contains=term)
|
|
| Q(website_title__contains=term)
|
|
| Q(website_description__contains=term)
|
|
| Q(url__contains=term)
|
|
)
|
|
|
|
for tag_name in query['tag_names']:
|
|
query_set = query_set.filter(
|
|
tags__name__iexact=tag_name
|
|
)
|
|
|
|
# Sort by date added
|
|
query_set = query_set.order_by('-date_added')
|
|
|
|
return query_set
|
|
|
|
|
|
def query_bookmark_tags(user: User, query_string: str) -> QuerySet:
|
|
bookmarks_query = query_bookmarks(user, query_string)
|
|
|
|
query_set = Tag.objects.filter(bookmark__in=bookmarks_query)
|
|
|
|
return query_set.distinct()
|
|
|
|
|
|
def query_archived_bookmark_tags(user: User, query_string: str) -> QuerySet:
|
|
bookmarks_query = query_archived_bookmarks(user, query_string)
|
|
|
|
query_set = Tag.objects.filter(bookmark__in=bookmarks_query)
|
|
|
|
return query_set.distinct()
|
|
|
|
|
|
def get_user_tags(user: User):
|
|
return Tag.objects.filter(owner=user).all()
|
|
|
|
|
|
def _parse_query_string(query_string):
|
|
# Sanitize query params
|
|
if not query_string:
|
|
query_string = ''
|
|
|
|
# Split query into search terms and tags
|
|
keywords = query_string.strip().split(' ')
|
|
keywords = [word for word in keywords if word]
|
|
|
|
search_terms = [word for word in keywords if word[0] != '#']
|
|
tag_names = [word[1:] for word in keywords if word[0] == '#']
|
|
tag_names = unique(tag_names, str.lower)
|
|
|
|
return {
|
|
'search_terms': search_terms,
|
|
'tag_names': tag_names,
|
|
}
|