haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00
Code Issues Releases Wiki Activity

optimize shared repo search

Browse Source
This commit is contained in:
‘JoinTyang’ 2025-04-10 15:38:34 +08:00
parent efb1ac8286
commit b6a396b57c
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
seahub/api2/utils.py
View File

@ -293,25 +293,41 @@ def is_wiki_repo(repo):
return repo.repo_type == REPO_TYPE_WIKI
def get_search_repos(username, org_id):
repos = []
owned_repos, shared_repos, group_repos, public_repos = get_user_repos(username, org_id=org_id)
repo_list = owned_repos + public_repos + shared_repos + group_repos
repo_id_set = set()
# filter duplicate repo search scopes
# for example, repo1 belongs to the group of user user1, and a folder under this repo is shared with this user,
# so there is no need to search in the shared subfolder
search_repo_id_to_repo_info = {} # {search_repo_id: (repo_id, origin_repo_id, origin_path, repo_name)}
for repo in repo_list:
# Skip the special repo
if repo.repo_type == REPO_TYPE_WIKI:
continue
repo_id = repo.id
origin_path = repo.origin_path
if repo.origin_repo_id:
repo_id = repo.origin_repo_id
if repo_id in repo_id_set:
continue
repo_id_set.add(repo_id)
repos.append((repo.id, repo.origin_repo_id, repo.origin_path, repo.name))
pre_search_repo_info = search_repo_id_to_repo_info.get(repo_id)
if pre_search_repo_info:
pre_origin_path = pre_search_repo_info[2]
# pre_repo is not shared subfolder
if pre_origin_path is None:
continue
return repos
if origin_path is None:
# current repo is not shared subfolder
search_repo_id_to_repo_info[repo_id] = (repo.id, repo.origin_repo_id, repo.origin_path, repo.name)
elif len(pre_origin_path.split('/')) > len(origin_path.split('/')):
# the pre shared subfolder level is deeper than current shared subfolder
search_repo_id_to_repo_info[repo_id] = (repo.id, repo.origin_repo_id, repo.origin_path, repo.name)
else:
search_repo_id_to_repo_info[repo_id] = (repo.id, repo.origin_repo_id, repo.origin_path, repo.name)
search_repos = list(search_repo_id_to_repo_info.values())
return search_repos
def send_share_link_emails(emails, fs, shared_from):
subject = _("A share link for you")

12
seahub/api2/views.py
View File

@ -648,8 +648,9 @@ class Search(APIView):
key = normalize_cache_key(username, RELATED_REPOS_PREFIX)
repos = cache.get(key, [])
if not repos:
repos = get_search_repos(username, org_id)[:SEARCH_REPOS_LIMIT]
repos = get_search_repos(username, org_id)
cache.set(key, repos, RELATED_REPOS_CACHE_TIMEOUT)
repos = repos[: SEARCH_REPOS_LIMIT]
else:
try:
repo = seafile_api.get_repo(search_repo)
@ -714,9 +715,6 @@ class ItemsSearch(APIView):
permission_classes = (IsAuthenticated, )
throttle_classes = (UserRateThrottle, )
USER_REPOS_CACHE_PREFIX = 'user_repos_'
USER_REPOS_CACHE_TIMEOUT = 2 * 60 * 60
def get(self, request):
"""search items"""
QUERY_TYPES = [
@ -738,11 +736,11 @@ class ItemsSearch(APIView):
org_id = request.user.org.org_id if is_org_context(request) else None
if query_type == 'library':
cache_key = normalize_cache_key(username, self.USER_REPOS_CACHE_PREFIX)
all_repos = cache.get(cache_key)
cache_key = normalize_cache_key(username, RELATED_REPOS_PREFIX)
all_repos = cache.get(cache_key, [])
if not all_repos:
all_repos = get_search_repos(username, org_id)
cache.set(cache_key, all_repos, self.USER_REPOS_CACHE_TIMEOUT)
cache.set(cache_key, all_repos, RELATED_REPOS_CACHE_TIMEOUT)
# Iterator avoids loading all memory at once
safe_pattern = re.escape(query_str)