From cbb0d34ca13e8ff52059b785a0742bf7620313e2 Mon Sep 17 00:00:00 2001 From: lian Date: Mon, 2 Mar 2015 14:10:44 +0800 Subject: [PATCH] [web-api] Use p and size as args --- seahub/api2/urls.py | 2 +- seahub/api2/views.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/seahub/api2/urls.py b/seahub/api2/urls.py index 877656cffe..904f7191b2 100644 --- a/seahub/api2/urls.py +++ b/seahub/api2/urls.py @@ -36,7 +36,7 @@ urlpatterns = patterns('', url(r'^repos/(?P[-0-9-a-f]{36})/dir/sub_repo/$', DirSubRepoView.as_view()), url(r'^repos/(?P[-0-9-a-f]{36})/dir/share/$', DirShareView.as_view()), url(r'^repos/(?P[-0-9-a-f]{36})/dir/download/$', DirDownloadView.as_view()), - url(r'^repos/(?P[-0-9-a-f]{36})/thumbnail/(?P.+)$', ThumbnailView.as_view(), name='api2-thumbnail'), + url(r'^repos/(?P[-0-9-a-f]{36})/thumbnail/$', ThumbnailView.as_view(), name='api2-thumbnail'), url(r'^starredfiles/', StarredFileView.as_view(), name='starredfiles'), url(r'^shared-repos/$', SharedRepos.as_view(), name='sharedrepos'), url(r'^shared-repos/(?P[-0-9-a-f]{36})/$', SharedRepo.as_view(), name='sharedrepo'), diff --git a/seahub/api2/views.py b/seahub/api2/views.py index f10d3a12ff..82b673b87c 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -3474,7 +3474,7 @@ class ThumbnailView(APIView): permission_classes = (IsAuthenticated,) throttle_classes = (UserRateThrottle, ) - def get(self, request, repo_id, path): + def get(self, request, repo_id): repo = get_repo(repo_id) if not repo: @@ -3489,10 +3489,14 @@ class ThumbnailView(APIView): return api_error(status.HTTP_403_FORBIDDEN, 'Thumbnail function is not enabled.') - size = request.GET.get('s', None) + size = request.GET.get('size', None) + path = request.GET.get('p', None) if size is None: return api_error(status.HTTP_400_BAD_REQUEST, 'Size is missing.') + if path is None: + return api_error(status.HTTP_400_BAD_REQUEST, 'Path is missing.') + obj_id = get_file_id_by_path(repo_id, path) if obj_id is None: