haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 08:53:14 +00:00
Code Issues Releases Wiki Activity

[api] fix a bug when the size is None

Browse Source
This commit is contained in:
poet
2012-07-26 02:17:32 +08:00
parent 354b1154a4
commit fcae536ba3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/views.py
View File

@@ -50,7 +50,9 @@ def calculate_repo_info(repo_list, username):
commit = get_commits(repo.id, 0, 1)[0] commit = get_commits(repo.id, 0, 1)[0]
repo.latest_modify = commit.ctime repo.latest_modify = commit.ctime
repo.root = commit.root_id repo.root = commit.root_id
repo.size = seafserv_threaded_rpc.server_repo_size(repo.id), repo.size = seafserv_threaded_rpc.server_repo_size(repo.id)
if not repo.size :
repo.size = 0;
password_need = False password_need = False
if repo.props.encrypted: if repo.props.encrypted:
try: try:
@@ -79,6 +81,13 @@ def can_access_repo(request, repo_id):
# check whether user can view repo # check whether user can view repo
return access_to_repo(request, repo_id, repo_ap) return access_to_repo(request, repo_id, repo_ap)
def get_file_size (id):
size = seafserv_threaded_rpc.get_file_size(dirent.obj_id)
if size:
return size
else:
return 0
def get_dir_entrys_by_path(reqquest, commit, path): def get_dir_entrys_by_path(reqquest, commit, path):
dentrys = [] dentrys = []
@@ -102,7 +111,7 @@ def get_dir_entrys_by_path(reqquest, commit, path):
entry["mime"] = mime entry["mime"] = mime
try: try:
entry["size"] = seafserv_threaded_rpc.get_file_size(dirent.obj_id) entry["size"] = get_file_size(dirent.obj_id)
except: except:
entry["size"]=0 entry["size"]=0
entry["type"]=dtype entry["type"]=dtype
@@ -128,7 +137,7 @@ def get_dir_entrys_by_id(reqquest, dir_id):
if mime: if mime:
entry["mime"] = mime entry["mime"] = mime
try: try:
entry["size"] = seafserv_threaded_rpc.get_file_size(dirent.obj_id) entry["size"] = get_file_size(dirent.obj_id)
except Exception, e: except Exception, e:
entry["size"]=0 entry["size"]=0
entry["type"]=dtype entry["type"]=dtype
@@ -247,7 +256,6 @@ class RepoView(ResponseMixin, View):
# query repo infomation # query repo infomation
repo_size = seafserv_threaded_rpc.server_repo_size(repo_id) repo_size = seafserv_threaded_rpc.server_repo_size(repo_id)
current_commit = get_commits(repo_id, 0, 1)[0] current_commit = get_commits(repo_id, 0, 1)[0]
repo_json = { repo_json = {
"type":"repo", "type":"repo",
"id":repo.props.id, "id":repo.props.id,