haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-10 19:29:56 +00:00
Code Issues Releases Wiki Activity

[api] fixed rpc arguments in seahub.api2.views

Browse Source
This commit is contained in:
lins05
2014-04-01 15:48:42 +08:00
parent cdb0cf300e
commit febf5ea091
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code-check.sh
View File

@@ -55,4 +55,4 @@ if ! [[ -f ${pylintrc} ]]; then
exit 1 exit 1
fi fi
pylint --rcfile=${pylintrc} $@ pylint --rcfile=${pylintrc} -E $@

6
seahub/api2/utils.py
View File

@@ -67,8 +67,8 @@ def calculate_repo_info(repo_list, username):
repo.root = commit.root_id repo.root = commit.root_id
repo.size = server_repo_size(repo.id) repo.size = server_repo_size(repo.id)
def get_file_size (fid): def get_file_size(store_id, repo_version, file_id):
size = seafile_api.get_file_size(fid) size = seafile_api.get_file_size(store_id, repo_version, file_id)
return size if size else 0 return size if size else 0
def prepare_starred_files(files): def prepare_starred_files(files):
@@ -84,7 +84,7 @@ def prepare_starred_files(files):
try: try:
file_id = seafile_api.get_file_id_by_path(f.repo.id, f.path) file_id = seafile_api.get_file_id_by_path(f.repo.id, f.path)
sfile['oid'] = file_id sfile['oid'] = file_id
sfile['size'] = get_file_size(file_id) sfile['size'] = get_file_size(f.repo.store_id, f.repo.version, file_id)
except SearpcError, e: except SearpcError, e:
pass pass

8
seahub/api2/views.py
View File

@@ -872,7 +872,7 @@ def get_repo_file(request, repo_id, file_id, file_name, op):
def reloaddir(request, repo, parent_dir): def reloaddir(request, repo, parent_dir):
try: try:
dir_id = seafile_api.get_dir_id_by_path(repo_id, dir_id = seafile_api.get_dir_id_by_path(repo.id,
parent_dir.encode('utf-8')) parent_dir.encode('utf-8'))
except SearpcError, e: except SearpcError, e:
logger.error(e) logger.error(e)
@@ -1451,7 +1451,7 @@ class DirView(APIView):
response["oid"] = dir_id response["oid"] = dir_id
return response return response
else: else:
return get_dir_entrys_by_id(request, repo_id, path, dir_id) return get_dir_entrys_by_id(request, repo, path, dir_id)
def post(self, request, repo_id, format=None): def post(self, request, repo_id, format=None):
# new dir # new dir
@@ -1584,7 +1584,7 @@ class DirDownloadView(APIView):
return api_error(status.HTTP_404_NOT_FOUND, "Path does not exist") return api_error(status.HTTP_404_NOT_FOUND, "Path does not exist")
try: try:
total_size = seafserv_threaded_rpc.get_dir_size(repo.store_id, reop.version, total_size = seafserv_threaded_rpc.get_dir_size(repo.store_id, repo.version,
dir_id) dir_id)
except Exception, e: except Exception, e:
logger.error(str(e)) logger.error(str(e))
@@ -2190,6 +2190,7 @@ class UserMsgsView(APIView):
UserMessage.objects.update_unread_messages(to_email, username) UserMessage.objects.update_unread_messages(to_email, username)
page = get_page_index(request, 1) page = get_page_index(request, 1)
next_page = -1
person_msgs = get_person_msgs(to_email, page, username) person_msgs = get_person_msgs(to_email, page, username)
if not person_msgs: if not person_msgs:
Response({ Response({
@@ -2197,7 +2198,6 @@ class UserMsgsView(APIView):
'next_page' : next_page, 'next_page' : next_page,
'msgs' : [],}) 'msgs' : [],})
next_page = -1
if person_msgs.has_next(): if person_msgs.has_next():
next_page = person_msgs.next_page_number() next_page = person_msgs.next_page_number()