engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

search: add option to search within a repository group.

Browse source
This commit is contained in:
Daniel Dourvaris 2019-01-30 13:15:46 +01:00
parent 1b76992c7d
commit 427c87316b
5 changed files with 83 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
rhodecode/apps/home/views.py
View file

@ -347,51 +347,75 @@ class HomeView(BaseAppView):
repo_context = search_context.get('search_context[repo_view_type]')
if is_es_6 and repo_name:
# files
def query_modifier():
qry = '{} repo_name.raw:{} '.format(
query, searcher.escape_specials(repo_name))
qry = query
return {'q': qry, 'type': 'content'}
label = u'Search for `{}` through files in this repository.'.format(query)
label = u'File search for `{}` in this repository.'.format(query)
queries.append(
{
'id': -10,
'value': query,
'value_display': label,
'type': 'search',
'url': h.route_path(
'search_repo', repo_name=repo_name, _query=query_modifier())
'url': h.route_path('search_repo',
repo_name=repo_name,
_query=query_modifier())
}
)
# commits
def query_modifier():
qry = '{} repo_name.raw:{} '.format(
query, searcher.escape_specials(repo_name))
qry = query
return {'q': qry, 'type': 'commit'}
label = u'Search for `{}` through commits in this repository.'.format(query)
label = u'Commit search for `{}` in this repository.'.format(query)
queries.append(
{
'id': -10,
'value': query,
'value_display': label,
'type': 'search',
'url': h.route_path(
'search_repo', repo_name=repo_name, _query=query_modifier())
'url': h.route_path('search_repo',
repo_name=repo_name,
_query=query_modifier())
}
)
elif is_es_6 and repo_group_name:
# files
def query_modifier():
qry = '{} repo_name.raw:{} '.format(
query, searcher.escape_specials(repo_group_name + '/*'))
qry = query
return {'q': qry, 'type': 'content'}
label = u'Search for `{}` through files in this repository group'.format(query)
label = u'File search for `{}` in this repository group'.format(query)
queries.append(
{
'id': -20,
'value': query,
'value_display': label,
'type': 'search',
'url': h.route_path('search', _query=query_modifier())
'url': h.route_path('search_repo_group',
repo_group_name=repo_group_name,
_query=query_modifier())
}
)
# commits
def query_modifier():
qry = query
return {'q': qry, 'type': 'commit'}
label = u'Commit search for `{}` in this repository group'.format(query)
queries.append(
{
'id': -20,
'value': query,
'value_display': label,
'type': 'search',
'url': h.route_path('search_repo_group',
repo_group_name=repo_group_name,
_query=query_modifier())
}
)

9
rhodecode/apps/search/__init__.py
View file

@ -28,7 +28,16 @@ def includeme(config):
config.add_route(
name='search_repo',
pattern='/{repo_name:.*?[^/]}/_search', repo_route=True)
config.add_route(
name='search_repo_alt',
pattern='/{repo_name:.*?[^/]}/search', repo_route=True)
config.add_route(
name='search_repo_group',
pattern='/{repo_group_name:.*?[^/]}/_search',
repo_group_route=True)
# Scan module for configuration decorators.
config.scan('.views', ignore='.tests')

41
rhodecode/apps/search/views.py
View file

@ -23,8 +23,9 @@ import urllib
from pyramid.view import view_config
from webhelpers.util import update_params
from rhodecode.apps._base import BaseAppView, RepoAppView
from rhodecode.lib.auth import (LoginRequired, HasRepoPermissionAnyDecorator)
from rhodecode.apps._base import BaseAppView, RepoAppView, RepoGroupAppView
from rhodecode.lib.auth import (
LoginRequired, HasRepoPermissionAnyDecorator, HasRepoGroupPermissionAnyDecorator)
from rhodecode.lib.helpers import Page
from rhodecode.lib.utils2 import safe_str
from rhodecode.lib.index import searcher_from_config
@ -34,7 +35,7 @@ from rhodecode.model.validation_schema.schemas import search_schema
log = logging.getLogger(__name__)
def search(request, tmpl_context, repo_name):
def perform_search(request, tmpl_context, repo_name=None, repo_group_name=None):
searcher = searcher_from_config(request.registry.settings)
formatted_results = []
execution_time = ''
@ -60,7 +61,8 @@ def search(request, tmpl_context, repo_name):
def url_generator(**kw):
q = urllib.quote(safe_str(search_query))
return update_params(
"?q=%s&type=%s&max_lines=%s" % (q, safe_str(search_type), search_max_lines), **kw)
"?q=%s&type=%s&max_lines=%s" % (
q, safe_str(search_type), search_max_lines), **kw)
c = tmpl_context
search_query = search_params.get('search_query')
@ -73,8 +75,8 @@ def search(request, tmpl_context, repo_name):
try:
search_result = searcher.search(
search_query, search_type, c.auth_user, repo_name,
requested_page, page_limit, search_sort)
search_query, search_type, c.auth_user, repo_name, repo_group_name,
requested_page=requested_page, page_limit=page_limit, sort=search_sort)
formatted_results = Page(
search_result['results'], page=requested_page,
@ -94,6 +96,7 @@ def search(request, tmpl_context, repo_name):
c.perm_user = c.auth_user
c.repo_name = repo_name
c.repo_group_name = repo_group_name
c.sort = search_sort
c.url_generator = url_generator
c.errors = errors
@ -107,7 +110,6 @@ def search(request, tmpl_context, repo_name):
class SearchView(BaseAppView):
def load_default_context(self):
c = self._get_local_tmpl_context()
return c
@LoginRequired()
@ -116,7 +118,7 @@ class SearchView(BaseAppView):
renderer='rhodecode:templates/search/search.mako')
def search(self):
c = self.load_default_context()
search(self.request, c, repo_name=None)
perform_search(self.request, c)
return self._get_template_context(c)
@ -132,7 +134,28 @@ class SearchRepoView(RepoAppView):
@view_config(
route_name='search_repo', request_method='GET',
renderer='rhodecode:templates/search/search.mako')
@view_config(
route_name='search_repo_alt', request_method='GET',
renderer='rhodecode:templates/search/search.mako')
def search_repo(self):
c = self.load_default_context()
search(self.request, c, repo_name=self.db_repo_name)
perform_search(self.request, c, repo_name=self.db_repo_name)
return self._get_template_context(c)
class SearchRepoGroupView(RepoGroupAppView):
def load_default_context(self):
c = self._get_local_tmpl_context()
c.active = 'search'
return c
@LoginRequired()
@HasRepoGroupPermissionAnyDecorator(
'group.read', 'group.write', 'group.admin')
@view_config(
route_name='search_repo_group', request_method='GET',
renderer='rhodecode:templates/search/search.mako')
def search_repo_group(self):
c = self.load_default_context()
perform_search(self.request, c, repo_group_name=self.db_repo_group_name)
return self._get_template_context(c)

3
rhodecode/lib/index/__init__.py
View file

@ -53,7 +53,8 @@ class BaseSearcher(object):
def cleanup(self):
pass
def search(self, query, document_type, search_user, repo_name=None,
def search(self, query, document_type, search_user,
repo_name=None, repo_group_name=None,
raise_on_exc=True):
raise Exception('NotImplemented')

4
rhodecode/lib/index/whoosh.py
View file

@ -100,8 +100,8 @@ class WhooshSearcher(BaseSearcher):
return query
def search(self, query, document_type, search_user,
repo_name=None, requested_page=1, page_limit=10, sort=None,
raise_on_exc=True):
repo_name=None, repo_group_name=None,
requested_page=1, page_limit=10, sort=None, raise_on_exc=True):
original_query = query
query = self._extend_query(query)