haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 20:37:42 +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/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/owner/(?P<owner_name>[^/]+)/$', ownerhome, name='ownerhome'),
# 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'),
(r'^repo/create/$', repo_create),
(r'^repo/upload_check/$', validate_filename),

101
seahub/views/__init__.py
View File

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

45
seahub/views/file.py
View File

@@ -7,19 +7,17 @@ view_snapshot_file, view_shared_file, file_edit, etc.
import os
import simplejson as json
import stat
import urllib
import urllib2
import chardet
import logging
from django.contrib.sites.models import Site, RequestSite
from django.contrib.sites.models import RequestSite
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db.models import F
from django.http import HttpResponse, HttpResponseBadRequest, Http404, \
HttpResponseRedirect
from django.shortcuts import render_to_response, redirect
from django.template import Context, loader, RequestContext
from django.http import HttpResponse, Http404, HttpResponseRedirect
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.template.loader import render_to_string
from django.utils.hashcompat import md5_constructor
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 seaserv import seafile_api
from seaserv import get_repo, web_get_access_token, \
get_commits, is_passwd_set, check_permission, get_shared_groups_by_repo,\
from seaserv import get_repo, web_get_access_token, send_message, \
get_commits, check_permission, get_shared_groups_by_repo,\
is_group_user, get_file_id_by_path, get_commit, get_file_size, \
get_org_groups_by_repo, seafserv_rpc, seafserv_threaded_rpc
from pysearpc import SearpcError
from seahub.auth.decorators import login_required
from seahub.base.decorators import repo_passwd_set_required
from seahub.base.models import UuidObjidMap
from seahub.contacts.models import Contact
from seahub.signals import share_file_to_user_successful
from seahub.share.models import FileShare, PrivateFileDirShare
from seahub.wiki.utils import get_wiki_dirent
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_contributors, get_ccnetapplet_root, render_permission_error, \
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:
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, \
FILE_ENCODING_TRY_LIST, USE_PDFJS, MEDIA_URL
from seahub.views import is_registered_user, get_file_access_permission, \
get_repo_access_permission, get_unencry_rw_repos_by_user
FILE_ENCODING_TRY_LIST, USE_PDFJS, MEDIA_URL, SITE_ROOT
from seahub.views import is_registered_user, get_repo_access_permission, \
get_unencry_rw_repos_by_user
# Get an instance of a logger
logger = logging.getLogger(__name__)
@@ -115,9 +112,11 @@ def repo_file_get(raw_path, file_enc):
file_response = urllib2.urlopen(raw_path)
content = file_response.read()
except urllib2.HTTPError, e:
logger.error(e)
err = _(u'HTTPError: failed to open file online')
return err, '', None
except urllib2.URLError as e:
logger.error(e)
err = _(u'URLError: failed to open file online')
return err, '', None
else:
@@ -450,7 +449,6 @@ def view_file(request, repo_id):
}, context_instance=RequestContext(request))
def view_history_file_common(request, repo_id, ret_dict):
username = request.user.username
# check arguments
repo = get_repo(repo_id)
if not repo:
@@ -628,7 +626,7 @@ def view_shared_file(request, token):
obj_size = seafserv_threaded_rpc.get_file_size(obj_id)
send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \
(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))
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)
send_message('seahub.stats', 'file-view\t%s\t%s\t%s\t%s' % \
(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))
return render_to_response('shared_file_view.html', {
@@ -745,7 +743,7 @@ def file_edit_submit(request, repo_id):
if not repo:
return error_json(_(u'The library does not exist.'))
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:
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
if filetype == TEXT or filetype == MARKDOWN or filetype == SF:
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:
op = 'decrypt'
if not op:
@@ -1015,7 +1013,7 @@ def office_convert_query_status(request):
ret['success'] = True
ret['status'] = d.status
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)
return HttpResponse(json.dumps(ret), content_type=content_type)
@@ -1043,7 +1041,7 @@ def office_convert_query_page_num(request):
ret['success'] = True
ret['count'] = d.count
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)
return HttpResponse(json.dumps(ret), content_type=content_type)
@@ -1114,7 +1112,7 @@ def save_private_file_share(request, repo_id):
username = request.user.username
from_user = request.GET.get('from', '')
to_user = request.GET.get('to', '')
path= request.GET.get('p', '')
path = request.GET.get('p', '')
src_path = os.path.dirname(path)
obj_name = os.path.basename(path.rstrip('/'))
@@ -1133,7 +1131,7 @@ def save_private_file_share(request, repo_id):
next = request.META.get('HTTP_REFERER', None)
if not next:
next = settings.SITE_ROOT
next = SITE_ROOT
return HttpResponseRedirect(next)
@login_required
@@ -1195,7 +1193,6 @@ def view_priv_shared_file(request, token):
'path': path,
'file_name': filename,
'access_token': access_token,
'filetype': filetype,
'fileext': fileext,
'raw_path': raw_path,
'shared_by': pfs.from_user,

13
seahub/views/repo.py
View File

@@ -1,11 +1,9 @@
# -*- coding: utf-8 -*-
import logging
import stat
import simplejson as json
from django.core.urlresolvers import reverse
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.template import RequestContext
from django.template.loader import render_to_string
@@ -17,12 +15,11 @@ from seahub.auth.decorators import login_required
from seahub.contacts.models import Contact
from seahub.forms import RepoPassowrdForm
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
from seahub.utils import get_ccnetapplet_root, is_file_starred, \
gen_file_upload_url, get_httpserver_root, gen_dir_share_link, \
EMPTY_SHA1
from seahub.utils import get_ccnetapplet_root, gen_file_upload_url, \
get_httpserver_root, gen_dir_share_link
from seahub.settings import ENABLE_SUB_LIBRARY
# Get an instance of a logger
@@ -261,7 +258,7 @@ def repo_history_view(request, repo_id):
commit_id = request.GET.get('commit_id', None)
if commit_id is None:
return HttpResponseRedirect(reverse('repo', args=[repo.id]))
return HttpResponseRedirect(reverse('repo', args=[repo.id]))
current_commit = get_commit(commit_id)
if not current_commit:
current_commit = get_commit(repo.head_cmmt_id)

25
seahub/views/sysadmin.py
View File

@@ -8,20 +8,14 @@ import simplejson as json
from django.core.urlresolvers import reverse
from django.core.mail import send_mail
from django.contrib import messages
from django.http import HttpResponse, HttpResponseBadRequest, Http404, \
HttpResponseRedirect
from django.shortcuts import render_to_response, redirect
from django.http import HttpResponse, Http404, HttpResponseRedirect
from django.shortcuts import render_to_response
from django.template import Context, loader, RequestContext
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.contrib.sites.models import Site, RequestSite
from django.core.mail import send_mail
from django.contrib.sites.models import RequestSite
import seaserv
from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_emailusers, \
MAX_DOWNLOAD_DIR_SIZE, CALC_SHARE_USAGE, \
send_message
from seaserv import ccnet_threaded_rpc, get_emailusers, CALC_SHARE_USAGE
from seaserv import seafile_api
from pysearpc import SearpcError
@@ -31,7 +25,7 @@ from seahub.auth.decorators import login_required
from seahub.utils import IS_EMAIL_CONFIGURED
from seahub.forms import SetUserQuotaForm, AddUserForm
from seahub.profile.models import Profile
from seahub.share.models import FileShare, AnonymousShare
from seahub.share.models import FileShare
import seahub.settings as settings
from seahub.settings import INIT_PASSWD, \
@@ -45,7 +39,7 @@ def sys_repo_admin(request):
# Make sure page request is an int. If not, deliver first page.
try:
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
per_page = int(request.GET.get('per_page', '25'))
except ValueError:
current_page = 1
per_page = 25
@@ -82,7 +76,7 @@ def sys_user_admin(request):
# Make sure page request is an int. If not, deliver first page.
try:
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
per_page = int(request.GET.get('per_page', '25'))
except ValueError:
current_page = 1
per_page = 25
@@ -155,6 +149,7 @@ def user_info(request, email):
try:
share_usage = seafile_api.get_user_share_usage(email)
except SearpcError, e:
logger.error(e)
share_usage = 0
quota_usage = my_usage + share_usage
else:
@@ -245,8 +240,6 @@ def send_user_reset_email(request, email, 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')
c = {
@@ -364,7 +357,7 @@ def sys_group_admin(request):
# Make sure page request is an int. If not, deliver first page.
try:
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
per_page = int(request.GET.get('per_page', '25'))
except ValueError:
current_page = 1
per_page = 25