haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-14 06:12:50 +00:00
Code Issues Releases Wiki Activity

Upadte to python3.

Browse Source
This commit is contained in:
ly1217
2019-06-27 22:30:31 -07:00
parent d6fec719c7
commit c73916ef77
109 changed files with 407 additions and 14614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
python/seaserv/__init__.py
View File

@@ -1,19 +1,18 @@
import service
from service import ccnet_rpc, seafserv_rpc, seafserv_threaded_rpc, ccnet_threaded_rpc
from service import send_command, check_quota, web_get_access_token, \
from . import service
from .service import seafserv_threaded_rpc, ccnet_threaded_rpc
from .service import send_command, check_quota, web_get_access_token, \
unset_repo_passwd, get_user_quota_usage, get_user_share_usage, \
get_user_quota
from service import get_emailusers, count_emailusers, get_session_info, \
from .service import get_emailusers, count_emailusers, \
get_emailuser_with_import
from service import get_org_groups, get_personal_groups_by_user, \
from .service import get_org_groups, get_personal_groups_by_user, \
get_group_repoids, get_personal_groups, list_share_repos, remove_share, \
check_group_staff, remove_group_user, get_group, get_org_id_by_group, \
get_group_members, get_shared_groups_by_repo, is_group_user, \
get_org_group_repos, get_group_repos, get_org_groups_by_user, is_org_group,\
del_org_group_repo, get_org_groups_by_repo, get_org_group_repoids, \
get_group_repos_by_owner, unshare_group_repo
from service import get_repos, get_repo, get_commits, get_branches, remove_repo, \
from .service import get_repos, get_repo, get_commits, get_branches, remove_repo, \
get_org_repos, is_repo_owner, create_org_repo, is_inner_pub_repo, \
list_org_inner_pub_repos, get_org_id_by_repo_id, list_org_shared_repos, \
list_personal_shared_repos, is_personal_repo, list_inner_pub_repos, \
@@ -23,21 +22,21 @@ from service import get_repos, get_repo, get_commits, get_branches, remove_repo,
get_repo_history_limit, list_inner_pub_repos_by_owner, unset_inner_pub_repo,\
count_inner_pub_repos, edit_repo, list_dir_by_path, create_repo, remove_repo
from service import get_binding_peerids, is_valid_filename, check_permission,\
from .service import get_binding_peerids, is_valid_filename, check_permission,\
is_passwd_set
from service import create_org, get_orgs_by_user, get_org_by_url_prefix, \
from .service import create_org, get_orgs_by_user, get_org_by_url_prefix, \
get_user_current_org, add_org_user, remove_org_user, get_org_by_id, \
get_org_id_by_repo_id, is_org_staff, get_org_users_by_url_prefix, \
org_user_exists, list_org_repos_by_owner
from service import get_related_users_by_repo, get_related_users_by_org_repo
from service import post_empty_file, del_file
from .service import get_related_users_by_repo, get_related_users_by_org_repo
from .service import post_empty_file, del_file
from service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT, \
from .service import CCNET_CONF_PATH, CCNET_SERVER_ADDR, CCNET_SERVER_PORT, \
MAX_UPLOAD_FILE_SIZE, MAX_DOWNLOAD_DIR_SIZE, FILE_SERVER_ROOT, \
CALC_SHARE_USAGE, SERVICE_URL, FILE_SERVER_PORT, SERVER_ID, \
SEAFILE_CENTRAL_CONF_DIR, LDAP_HOST
from service import send_message
from .service import send_message
from api import seafile_api, ccnet_api
from .api import seafile_api, ccnet_api

21
python/seaserv/api.py
View File

@@ -1,5 +1,4 @@
from service import seafserv_rpc, seafserv_threaded_rpc, ccnet_threaded_rpc
from .service import seafserv_threaded_rpc, ccnet_threaded_rpc
from pysearpc import SearpcError
import json
@@ -34,8 +33,8 @@ class SeafileAPI(object):
Return: the access token in string
"""
onetime = 1 if bool(use_onetime) else 0
return seafserv_rpc.web_get_access_token(repo_id, obj_id, op, username,
onetime)
return seafserv_threaded_rpc.web_get_access_token(repo_id, obj_id, op, username,
onetime)
def query_fileserver_access_token(self, token):
"""Get the WebAccess object
@@ -44,17 +43,17 @@ class SeafileAPI(object):
Return: the WebAccess object (lib/webaccess.vala)
"""
return seafserv_rpc.web_query_access_token(token)
return seafserv_threaded_rpc.web_query_access_token(token)
def query_zip_progress(self, token):
"""Query zip progress for download-dir, download-multi
token: obtained by get_fileserver_access_token
Return: json formated string `{"zipped":, "total":}`, otherwise None.
"""
return seafserv_rpc.query_zip_progress(token)
return seafserv_threaded_rpc.query_zip_progress(token)
def cancel_zip_task(self, token):
return seafserv_rpc.cancel_zip_task(token)
return seafserv_threaded_rpc.cancel_zip_task(token)
# password
@@ -62,13 +61,13 @@ class SeafileAPI(object):
"""
Return non-zero if True, otherwise 0.
"""
return seafserv_rpc.is_passwd_set(repo_id, username)
return seafserv_threaded_rpc.is_passwd_set(repo_id, username)
def get_decrypt_key(self, repo_id, username):
"""
Return: a CryptKey object (lib/crypt.vala)
"""
return seafserv_rpc.get_decrypt_key(repo_id, username)
return seafserv_threaded_rpc.get_decrypt_key(repo_id, username)
def change_repo_passwd(self, repo_id, old_passwd, new_passwd, user):
return seafserv_threaded_rpc.change_repo_passwd(repo_id, old_passwd,
@@ -311,10 +310,10 @@ class SeafileAPI(object):
replace, username, need_progress, synchronous)
def get_copy_task(self, task_id):
return seafserv_rpc.get_copy_task(task_id)
return seafserv_threaded_rpc.get_copy_task(task_id)
def cancel_copy_task(self, task_id):
return seafserv_rpc.cancel_copy_task(task_id)
return seafserv_threaded_rpc.cancel_copy_task(task_id)
def rename_file(self, repo_id, parent_dir, oldname, newname, username):
return seafserv_threaded_rpc.rename_file(repo_id, parent_dir,

60
python/seaserv/service.py
View File

@@ -3,8 +3,8 @@ import json
import logging
import os
import sys
import ConfigParser
from urlparse import urlparse
import configparser
from urllib.parse import urlparse
import ccnet
import seafile
@@ -25,22 +25,25 @@ def _load_path_from_env(key, check=True):
raise ImportError("Seaserv cannot be imported, because environment variable %s is undefined." % key)
return None
if _DEBUG:
print "Loading %s from %s" % (key, v)
print("Loading %s from %s" % (key, v))
return os.path.normpath(os.path.expanduser(v))
CCNET_CONF_PATH = _load_path_from_env('CCNET_CONF_DIR')
SEAFILE_CONF_DIR = _load_path_from_env('SEAFILE_CONF_DIR')
SEAFILE_CENTRAL_CONF_DIR = _load_path_from_env('SEAFILE_CENTRAL_CONF_DIR', check=False)
pool = ccnet.ClientPool(CCNET_CONF_PATH, central_config_dir=SEAFILE_CENTRAL_CONF_DIR)
ccnet_rpc = ccnet.CcnetRpcClient(pool, req_pool=True)
ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(pool, req_pool=True)
seafserv_rpc = seafile.ServerRpcClient(pool, req_pool=True)
seafserv_threaded_rpc = seafile.ServerThreadedRpcClient(pool, req_pool=True)
ccnet_pipe_path = os.path.join (CCNET_CONF_PATH, 'ccnet-rpc.sock')
ccnet_threaded_rpc = ccnet.CcnetThreadedRpcClient(ccnet_pipe_path)
if SEAFILE_CENTRAL_CONF_DIR:
seafile_pipe_path = os.path.join(SEAFILE_CENTRAL_CONF_DIR, 'seafile.sock')
else:
seafile_pipe_path = os.path.join(SEAFILE_CONF_DIR, 'seafile.sock')
seafserv_threaded_rpc = seafile.ServerThreadedRpcClient(seafile_pipe_path)
# load ccnet server addr and port from ccnet.conf.
# 'addr:port' is used when downloading a repo
config = ConfigParser.ConfigParser()
config = configparser.ConfigParser()
config.read(os.path.join(SEAFILE_CENTRAL_CONF_DIR if SEAFILE_CENTRAL_CONF_DIR else CCNET_CONF_PATH,
'ccnet.conf'))
@@ -55,7 +58,7 @@ if config.has_option('General', 'SERVICE_URL'):
else:
CCNET_SERVER_PORT = 10001
else:
print "Warning: SERVICE_URL not set in ccnet.conf"
print("Warning: SERVICE_URL not set in ccnet.conf")
CCNET_SERVER_ADDR = None
CCNET_SERVER_PORT = None
SERVICE_URL = None
@@ -131,9 +134,6 @@ def count_emailusers():
def get_emailuser_with_import(email):
return ccnet_threaded_rpc.get_emailuser_with_import(email)
def get_session_info():
return ccnet_rpc.get_session_info()
# group
def get_group(group_id):
group_id_int = int(group_id)
@@ -171,7 +171,7 @@ def check_group_staff(group_id, username):
group_id = int(group_id)
try:
ret = ccnet_threaded_rpc.check_group_staff(group_id, username)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = 0
@@ -344,7 +344,7 @@ def get_repo(repo_id):
def edit_repo(repo_id, name, desc, user):
try:
ret = seafserv_threaded_rpc.edit_repo(repo_id, name, desc, user)
except SearpcError, e:
except SearpcError as e:
ret = -1
return True if ret == 0 else False
@@ -354,7 +354,7 @@ def create_repo(name, desc, user, passwd):
"""
try:
ret = seafserv_threaded_rpc.create_repo(name, desc, user, passwd)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = None
return ret
@@ -365,7 +365,7 @@ def remove_repo(repo_id):
"""
try:
ret = seafserv_threaded_rpc.remove_repo(repo_id)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = -1
return True if ret == 0 else False
@@ -784,7 +784,7 @@ def post_empty_file(repo_id, parent_dir, file_name, user):
try:
ret = seafserv_threaded_rpc.post_empty_file(repo_id, parent_dir,
file_name, user)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = -1
return True if ret == 0 else False
@@ -796,7 +796,7 @@ def del_file(repo_id, parent_dir, file_name, user):
try:
ret = seafserv_threaded_rpc.del_file(repo_id, parent_dir,
file_name, user)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = -1
return True if ret == 0 else False
@@ -816,14 +816,14 @@ def is_valid_filename(file_or_dir):
def get_file_size(store_id, version, file_id):
try:
fs = seafserv_threaded_rpc.get_file_size(store_id, version, file_id)
except SearpcError, e:
except SearpcError as e:
fs = 0
return fs
def get_file_id_by_path(repo_id, path):
try:
ret = seafserv_threaded_rpc.get_file_id_by_path(repo_id, path)
except SearpcError, e:
except SearpcError as e:
ret = ''
return ret
@@ -889,7 +889,7 @@ def get_related_users_by_org_repo(org_id, repo_id):
def check_quota(repo_id, delta=0):
try:
ret = seafserv_threaded_rpc.check_quota(repo_id, delta)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = -1
return ret
@@ -897,7 +897,7 @@ def check_quota(repo_id, delta=0):
def get_user_quota(user):
try:
ret = seafserv_threaded_rpc.get_user_quota(user)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = 0
return ret
@@ -905,7 +905,7 @@ def get_user_quota(user):
def get_user_quota_usage(user):
try:
ret = seafserv_threaded_rpc.get_user_quota_usage(user)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = 0
return ret
@@ -913,7 +913,7 @@ def get_user_quota_usage(user):
def get_user_share_usage(user):
try:
ret = seafserv_threaded_rpc.get_user_share_usage(user)
except SearpcError, e:
except SearpcError as e:
logger.error(e)
ret = 0
return ret
@@ -922,7 +922,7 @@ def get_user_share_usage(user):
def web_get_access_token(repo_id, obj_id, op, username, use_onetime=1):
try:
ret = seafserv_rpc.web_get_access_token(repo_id, obj_id, op, username, use_onetime)
except SearpcError, e:
except SearpcError as e:
ret = ''
return ret
@@ -936,14 +936,14 @@ def unset_repo_passwd(repo_id, user):
"""
try:
ret = seafserv_threaded_rpc.unset_passwd(repo_id, user)
except SearpcError, e:
except SearpcError as e:
ret = -1
return ret
def is_passwd_set(repo_id, user):
try:
ret = seafserv_rpc.is_passwd_set(repo_id, user)
except SearpcError, e:
except SearpcError as e:
ret = -1
return True if ret == 1 else False
@@ -951,13 +951,13 @@ def is_passwd_set(repo_id, user):
def get_repo_history_limit(repo_id):
try:
ret = seafserv_threaded_rpc.get_repo_history_limit(repo_id)
except SearpcError, e:
except SearpcError as e:
ret = -1
return ret
def set_repo_history_limit(repo_id, days):
try:
ret = seafserv_threaded_rpc.set_repo_history_limit(repo_id, days)
except SearpcError, e:
except SearpcError as e:
ret = -1
return ret