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

Comment out unused code, and fixed a few typos

Browse Source
This commit is contained in:
zhengxie
2013-07-30 11:35:02 +08:00
parent d9ed272fe1
commit 8d5e0f66dc
5 changed files with 86 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/urls.py
View File

@@ -51,8 +51,8 @@ urlpatterns = patterns('',
url(r'^home/clients/$', client_mgmt, name='client_mgmt'), url(r'^home/clients/$', client_mgmt, name='client_mgmt'),
url(r'^home/clients/unsync/$', client_unsync, name='client_unsync'), url(r'^home/clients/unsync/$', client_unsync, name='client_unsync'),
url(r'^home/public/reply/(?P<msg_id>[\d]+)/$', innerpub_msg_reply, name='innerpub_msg_reply'), # url(r'^home/public/reply/(?P<msg_id>[\d]+)/$', innerpub_msg_reply, name='innerpub_msg_reply'),
url(r'^home/owner/(?P<owner_name>[^/]+)/$', ownerhome, name='ownerhome'), # url(r'^home/owner/(?P<owner_name>[^/]+)/$', ownerhome, name='ownerhome'),
(r'^repo/create/$', repo_create), (r'^repo/create/$', repo_create),
(r'^repo/upload_check/$', validate_filename), (r'^repo/upload_check/$', validate_filename),

99
seahub/views/__init__.py
View File

@@ -204,8 +204,6 @@ def get_repo_dirents(request, repo_id, commit, path):
last_modified_info = get_dir_files_last_modified(repo_id, path) last_modified_info = get_dir_files_last_modified(repo_id, path)
fileshares = FileShare.objects.filter(repo_id=repo_id).filter(username=request.user.username) fileshares = FileShare.objects.filter(repo_id=repo_id).filter(username=request.user.username)
http_or_https = request.is_secure() and 'https' or 'http'
domain = RequestSite(request).domain
for dirent in dirs: for dirent in dirs:
dirent.last_modified = last_modified_info.get(dirent.obj_name, 0) dirent.last_modified = last_modified_info.get(dirent.obj_name, 0)
@@ -945,7 +943,7 @@ def client_unsync(request):
repo_id = request.GET.get('repo_id', '') repo_id = request.GET.get('repo_id', '')
token = request.GET.get('token', '') token = request.GET.get('token', '')
username = request.user.username username = request.user.username
client_name = request.GET.get('name', ''); client_name = request.GET.get('name', '')
if repo_id and token: if repo_id and token:
try: try:
@@ -965,47 +963,47 @@ def client_unsync(request):
next = settings.SITE_ROOT next = settings.SITE_ROOT
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
@login_required # @login_required
def innerpub_msg_reply(request, msg_id): # def innerpub_msg_reply(request, msg_id):
"""Show inner pub message replies, and process message reply in ajax""" # """Show inner pub message replies, and process message reply in ajax"""
content_type = 'application/json; charset=utf-8' # content_type = 'application/json; charset=utf-8'
if request.is_ajax(): # if request.is_ajax():
ctx = {} # ctx = {}
if request.method == 'POST': # if request.method == 'POST':
form = MessageReplyForm(request.POST) # form = MessageReplyForm(request.POST)
# TODO: invalid form # # TODO: invalid form
if form.is_valid(): # if form.is_valid():
msg = form.cleaned_data['message'] # msg = form.cleaned_data['message']
try: # try:
innerpub_msg = InnerPubMsg.objects.get(id=msg_id) # innerpub_msg = InnerPubMsg.objects.get(id=msg_id)
except InnerPubMsg.DoesNotExist: # except InnerPubMsg.DoesNotExist:
return HttpResponseBadRequest(content_type=content_type) # return HttpResponseBadRequest(content_type=content_type)
msg_reply = InnerPubMsgReply() # msg_reply = InnerPubMsgReply()
msg_reply.reply_to = innerpub_msg # msg_reply.reply_to = innerpub_msg
msg_reply.from_email = request.user.username # msg_reply.from_email = request.user.username
msg_reply.message = msg # msg_reply.message = msg
msg_reply.save() # msg_reply.save()
ctx['reply'] = msg_reply # ctx['reply'] = msg_reply
html = render_to_string("group/group_reply_new.html", ctx) # html = render_to_string("group/group_reply_new.html", ctx)
else: # else:
try: # try:
msg = InnerPubMsg.objects.get(id=msg_id) # msg = InnerPubMsg.objects.get(id=msg_id)
except InnerPubMsg.DoesNotExist: # except InnerPubMsg.DoesNotExist:
raise HttpResponse(status=400) # raise HttpResponse(status=400)
replies = InnerPubMsgReply.objects.filter(reply_to=msg) # replies = InnerPubMsgReply.objects.filter(reply_to=msg)
ctx['replies'] = replies # ctx['replies'] = replies
html = render_to_string("group/group_reply_list.html", ctx) # html = render_to_string("group/group_reply_list.html", ctx)
serialized_data = json.dumps({"html": html}) # serialized_data = json.dumps({"html": html})
return HttpResponse(serialized_data, content_type=content_type) # return HttpResponse(serialized_data, content_type=content_type)
else: # else:
return HttpResponseBadRequest(content_type=content_type) # return HttpResponseBadRequest(content_type=content_type)
@login_required @login_required
def public_repo_create(request): def public_repo_create(request):
@@ -1064,22 +1062,22 @@ def unsetinnerpub(request, repo_id):
messages.error(request, _('Failed to unshare "%s".') % repo.name) messages.error(request, _('Failed to unshare "%s".') % repo.name)
return HttpResponseRedirect(reverse('share_admin')) return HttpResponseRedirect(reverse('share_admin'))
@login_required # @login_required
def ownerhome(request, owner_name): # def ownerhome(request, owner_name):
owned_repos = [] # owned_repos = []
quota_usage = 0 # quota_usage = 0
owned_repos = seafserv_threaded_rpc.list_owned_repos(owner_name) # owned_repos = seafserv_threaded_rpc.list_owned_repos(owner_name)
quota_usage = seafserv_threaded_rpc.get_user_quota_usage(owner_name) # quota_usage = seafserv_threaded_rpc.get_user_quota_usage(owner_name)
user_dict = user_info(request, owner_name) # user_dict = user_info(request, owner_name)
return render_to_response('ownerhome.html', { # return render_to_response('ownerhome.html', {
"owned_repos": owned_repos, # "owned_repos": owned_repos,
"quota_usage": quota_usage, # "quota_usage": quota_usage,
"owner": owner_name, # "owner": owner_name,
"user_dict": user_dict, # "user_dict": user_dict,
}, context_instance=RequestContext(request)) # }, context_instance=RequestContext(request))
@login_required @login_required
def repo_set_access_property(request, repo_id): def repo_set_access_property(request, repo_id):
@@ -1158,7 +1156,6 @@ def repo_access_file(request, repo_id, obj_id):
(repo.id, shared_by, obj_id, file_size)) (repo.id, shared_by, obj_id, file_size))
except Exception, e: except Exception, e:
logger.error('Error when sending file-download message: %s' % str(e)) logger.error('Error when sending file-download message: %s' % str(e))
pass
return HttpResponseRedirect(redirect_url) return HttpResponseRedirect(redirect_url)

43
seahub/views/file.py
View File

@@ -7,19 +7,17 @@ view_snapshot_file, view_shared_file, file_edit, etc.
import os import os
import simplejson as json import simplejson as json
import stat import stat
import urllib
import urllib2 import urllib2
import chardet import chardet
import logging import logging
from django.contrib.sites.models import Site, RequestSite from django.contrib.sites.models import RequestSite
from django.contrib import messages from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.db.models import F from django.db.models import F
from django.http import HttpResponse, HttpResponseBadRequest, Http404, \ from django.http import HttpResponse, Http404, HttpResponseRedirect
HttpResponseRedirect from django.shortcuts import render_to_response
from django.shortcuts import render_to_response, redirect from django.template import RequestContext
from django.template import Context, loader, RequestContext
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.utils.hashcompat import md5_constructor from django.utils.hashcompat import md5_constructor
from django.utils.http import urlquote from django.utils.http import urlquote
@@ -28,21 +26,20 @@ from django.views.decorators.http import require_POST
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
from seaserv import seafile_api from seaserv import seafile_api
from seaserv import get_repo, web_get_access_token, \ from seaserv import get_repo, web_get_access_token, send_message, \
get_commits, is_passwd_set, check_permission, get_shared_groups_by_repo,\ get_commits, check_permission, get_shared_groups_by_repo,\
is_group_user, get_file_id_by_path, get_commit, get_file_size, \ is_group_user, get_file_id_by_path, get_commit, get_file_size, \
get_org_groups_by_repo, seafserv_rpc, seafserv_threaded_rpc get_org_groups_by_repo, seafserv_rpc, seafserv_threaded_rpc
from pysearpc import SearpcError from pysearpc import SearpcError
from seahub.auth.decorators import login_required from seahub.auth.decorators import login_required
from seahub.base.decorators import repo_passwd_set_required from seahub.base.decorators import repo_passwd_set_required
from seahub.base.models import UuidObjidMap
from seahub.contacts.models import Contact from seahub.contacts.models import Contact
from seahub.signals import share_file_to_user_successful from seahub.signals import share_file_to_user_successful
from seahub.share.models import FileShare, PrivateFileDirShare from seahub.share.models import FileShare, PrivateFileDirShare
from seahub.wiki.utils import get_wiki_dirent from seahub.wiki.utils import get_wiki_dirent
from seahub.wiki.models import WikiDoesNotExist, WikiPageMissing from seahub.wiki.models import WikiDoesNotExist, WikiPageMissing
from seahub.utils import get_httpserver_root, show_delete_days, render_error, \ from seahub.utils import show_delete_days, render_error, \
get_file_type_and_ext, gen_file_get_url, gen_file_share_link, is_file_starred, \ get_file_type_and_ext, gen_file_get_url, gen_file_share_link, is_file_starred, \
get_file_contributors, get_ccnetapplet_root, render_permission_error, \ get_file_contributors, get_ccnetapplet_root, render_permission_error, \
is_textual_file, show_delete_days, mkstemp, EMPTY_SHA1, HtmlDiff, \ is_textual_file, show_delete_days, mkstemp, EMPTY_SHA1, HtmlDiff, \
@@ -53,12 +50,12 @@ from seahub.utils import HAS_OFFICE_CONVERTER
if HAS_OFFICE_CONVERTER: if HAS_OFFICE_CONVERTER:
from seahub.utils import query_office_convert_status, query_office_file_pages, \ from seahub.utils import query_office_convert_status, query_office_file_pages, \
prepare_converted_html, OFFICE_PREVIEW_MAX_SIZE, OFFICE_PREVIEW_MAX_PAGES prepare_converted_html, OFFICE_PREVIEW_MAX_SIZE
from seahub.settings import FILE_ENCODING_LIST, FILE_PREVIEW_MAX_SIZE, \ from seahub.settings import FILE_ENCODING_LIST, FILE_PREVIEW_MAX_SIZE, \
FILE_ENCODING_TRY_LIST, USE_PDFJS, MEDIA_URL FILE_ENCODING_TRY_LIST, USE_PDFJS, MEDIA_URL, SITE_ROOT
from seahub.views import is_registered_user, get_file_access_permission, \ from seahub.views import is_registered_user, get_repo_access_permission, \
get_repo_access_permission, get_unencry_rw_repos_by_user get_unencry_rw_repos_by_user
# Get an instance of a logger # Get an instance of a logger
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -115,9 +112,11 @@ def repo_file_get(raw_path, file_enc):
file_response = urllib2.urlopen(raw_path) file_response = urllib2.urlopen(raw_path)
content = file_response.read() content = file_response.read()
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
logger.error(e)
err = _(u'HTTPError: failed to open file online') err = _(u'HTTPError: failed to open file online')
return err, '', None return err, '', None
except urllib2.URLError as e: except urllib2.URLError as e:
logger.error(e)
err = _(u'URLError: failed to open file online') err = _(u'URLError: failed to open file online')
return err, '', None return err, '', None
else: else:
@@ -450,7 +449,6 @@ def view_file(request, repo_id):
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
def view_history_file_common(request, repo_id, ret_dict): def view_history_file_common(request, repo_id, ret_dict):
username = request.user.username
# check arguments # check arguments
repo = get_repo(repo_id) repo = get_repo(repo_id)
if not repo: if not repo:
@@ -628,7 +626,7 @@ def view_shared_file(request, token):
obj_size = seafserv_threaded_rpc.get_file_size(obj_id) obj_size = seafserv_threaded_rpc.get_file_size(obj_id)
send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \ send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \
(repo.id, shared_by, obj_id, obj_size)) (repo.id, shared_by, obj_id, obj_size))
except Exception, e: except SearpcError, e:
logger.error('Error when sending file-view message: %s' % str(e)) logger.error('Error when sending file-view message: %s' % str(e))
return render_to_response('shared_file_view.html', { return render_to_response('shared_file_view.html', {
@@ -706,7 +704,7 @@ def view_file_via_shared_dir(request, token):
obj_size = seafserv_threaded_rpc.get_file_size(obj_id) obj_size = seafserv_threaded_rpc.get_file_size(obj_id)
send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \ send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \
(repo.id, shared_by, obj_id, obj_size)) (repo.id, shared_by, obj_id, obj_size))
except Exception, e: except SearpcError, e:
logger.error('Error when sending file-view message: %s' % str(e)) logger.error('Error when sending file-view message: %s' % str(e))
return render_to_response('shared_file_view.html', { return render_to_response('shared_file_view.html', {
@@ -745,7 +743,7 @@ def file_edit_submit(request, repo_id):
if not repo: if not repo:
return error_json(_(u'The library does not exist.')) return error_json(_(u'The library does not exist.'))
if repo.encrypted: if repo.encrypted:
repo.password_set = seafserv_rpc.is_passwd_set(repo_id, request.user.username) repo.password_set = seafile_api.is_passwd_set(repo_id, request.user.username)
if not repo.password_set: if not repo.password_set:
return error_json(_(u'The library is encrypted.'), 'decrypt') return error_json(_(u'The library is encrypted.'), 'decrypt')
@@ -849,7 +847,7 @@ def file_edit(request, repo_id):
file_encoding_list = FILE_ENCODING_LIST file_encoding_list = FILE_ENCODING_LIST
if filetype == TEXT or filetype == MARKDOWN or filetype == SF: if filetype == TEXT or filetype == MARKDOWN or filetype == SF:
if repo.encrypted: if repo.encrypted:
repo.password_set = seafserv_rpc.is_passwd_set(repo_id, request.user.username) repo.password_set = seafile_api.is_passwd_set(repo_id, request.user.username)
if not repo.password_set: if not repo.password_set:
op = 'decrypt' op = 'decrypt'
if not op: if not op:
@@ -1015,7 +1013,7 @@ def office_convert_query_status(request):
ret['success'] = True ret['success'] = True
ret['status'] = d.status ret['status'] = d.status
except Exception, e: except Exception, e:
logging.exception('failed to call query_office_convert_status'); logging.exception('failed to call query_office_convert_status')
ret['error'] = str(e) ret['error'] = str(e)
return HttpResponse(json.dumps(ret), content_type=content_type) return HttpResponse(json.dumps(ret), content_type=content_type)
@@ -1043,7 +1041,7 @@ def office_convert_query_page_num(request):
ret['success'] = True ret['success'] = True
ret['count'] = d.count ret['count'] = d.count
except Exception, e: except Exception, e:
logging.exception('failed to call query_office_file_pages'); logging.exception('failed to call query_office_file_pages')
ret['error'] = str(e) ret['error'] = str(e)
return HttpResponse(json.dumps(ret), content_type=content_type) return HttpResponse(json.dumps(ret), content_type=content_type)
@@ -1133,7 +1131,7 @@ def save_private_file_share(request, repo_id):
next = request.META.get('HTTP_REFERER', None) next = request.META.get('HTTP_REFERER', None)
if not next: if not next:
next = settings.SITE_ROOT next = SITE_ROOT
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
@login_required @login_required
@@ -1195,7 +1193,6 @@ def view_priv_shared_file(request, token):
'path': path, 'path': path,
'file_name': filename, 'file_name': filename,
'access_token': access_token, 'access_token': access_token,
'filetype': filetype,
'fileext': fileext, 'fileext': fileext,
'raw_path': raw_path, 'raw_path': raw_path,
'shared_by': pfs.from_user, 'shared_by': pfs.from_user,

9
seahub/views/repo.py
View File

@@ -1,11 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import logging import logging
import stat
import simplejson as json
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.contrib.sites.models import RequestSite from django.contrib.sites.models import RequestSite
from django.http import HttpResponse, Http404, HttpResponseRedirect from django.http import Http404, HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from django.template import RequestContext from django.template import RequestContext
from django.template.loader import render_to_string from django.template.loader import render_to_string
@@ -20,9 +18,8 @@ from seahub.share.models import FileShare, PrivateFileDirShare
from seahub.views import gen_path_link, get_user_permission, get_repo_dirents, \ from seahub.views import gen_path_link, get_user_permission, get_repo_dirents, \
get_unencry_rw_repos_by_user get_unencry_rw_repos_by_user
from seahub.utils import get_ccnetapplet_root, is_file_starred, \ from seahub.utils import get_ccnetapplet_root, gen_file_upload_url, \
gen_file_upload_url, get_httpserver_root, gen_dir_share_link, \ get_httpserver_root, gen_dir_share_link
EMPTY_SHA1
from seahub.settings import ENABLE_SUB_LIBRARY from seahub.settings import ENABLE_SUB_LIBRARY
# Get an instance of a logger # Get an instance of a logger

19
seahub/views/sysadmin.py
View File

@@ -8,20 +8,14 @@ import simplejson as json
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.mail import send_mail from django.core.mail import send_mail
from django.contrib import messages from django.contrib import messages
from django.http import HttpResponse, HttpResponseBadRequest, Http404, \ from django.http import HttpResponse, Http404, HttpResponseRedirect
HttpResponseRedirect from django.shortcuts import render_to_response
from django.shortcuts import render_to_response, redirect
from django.template import Context, loader, RequestContext from django.template import Context, loader, RequestContext
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from django.contrib.sites.models import Site, RequestSite from django.contrib.sites.models import RequestSite
from django.core.mail import send_mail
import seaserv import seaserv
from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_emailusers, \ from seaserv import ccnet_threaded_rpc, get_emailusers, CALC_SHARE_USAGE
MAX_DOWNLOAD_DIR_SIZE, CALC_SHARE_USAGE, \
send_message
from seaserv import seafile_api from seaserv import seafile_api
from pysearpc import SearpcError from pysearpc import SearpcError
@@ -31,7 +25,7 @@ from seahub.auth.decorators import login_required
from seahub.utils import IS_EMAIL_CONFIGURED from seahub.utils import IS_EMAIL_CONFIGURED
from seahub.forms import SetUserQuotaForm, AddUserForm from seahub.forms import SetUserQuotaForm, AddUserForm
from seahub.profile.models import Profile from seahub.profile.models import Profile
from seahub.share.models import FileShare, AnonymousShare from seahub.share.models import FileShare
import seahub.settings as settings import seahub.settings as settings
from seahub.settings import INIT_PASSWD, \ from seahub.settings import INIT_PASSWD, \
@@ -155,6 +149,7 @@ def user_info(request, email):
try: try:
share_usage = seafile_api.get_user_share_usage(email) share_usage = seafile_api.get_user_share_usage(email)
except SearpcError, e: except SearpcError, e:
logger.error(e)
share_usage = 0 share_usage = 0
quota_usage = my_usage + share_usage quota_usage = my_usage + share_usage
else: else:
@@ -245,8 +240,6 @@ def send_user_reset_email(request, email, password):
""" """
Send email when reset user password. Send email when reset user password.
""" """
use_https = request.is_secure()
domain = RequestSite(request).domain
t = loader.get_template('sysadmin/user_reset_email.html') t = loader.get_template('sysadmin/user_reset_email.html')
c = { c = {