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

Merge pull request #1576 from haiwen/wopi-setting

Browse Source 
add OFFICE_SERVER_TYPE for wopi app
This commit is contained in:
xiez
2017-05-09 10:55:07 +08:00
committed by GitHub
parent 570faa2185 90071b9ddf
commit e86c8ec134
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
seahub/wopi/settings.py
View File

@@ -1,6 +1,9 @@
# Copyright (c) 2012-2016 Seafile Ltd.
import seahub.settings as settings
# OfficeOnlineServer, OnlyOffice, CollaboraOffice
OFFICE_SERVER_TYPE = getattr(settings, 'OFFICE_SERVER_TYPE', '')
OFFICE_WEB_APP_BASE_URL = getattr(settings, 'OFFICE_WEB_APP_BASE_URL', '')
WOPI_ACCESS_TOKEN_EXPIRATION = getattr(settings, 'WOPI_ACCESS_TOKEN_EXPIRATION', 30 * 60)
OFFICE_WEB_APP_DISCOVERY_EXPIRATION = getattr(settings, 'OFFICE_WEB_APP_DISCOVERY_EXPIRATION', 24 * 60 * 60)

12
seahub/wopi/utils.py
View File

@@ -26,7 +26,7 @@ from seahub.utils import get_site_scheme_and_netloc
from .settings import OFFICE_WEB_APP_BASE_URL, WOPI_ACCESS_TOKEN_EXPIRATION, \
OFFICE_WEB_APP_DISCOVERY_EXPIRATION, OFFICE_WEB_APP_CLIENT_PEM, \
OFFICE_WEB_APP_CLIENT_CERT, OFFICE_WEB_APP_CLIENT_KEY, \
OFFICE_WEB_APP_SERVER_CA
OFFICE_WEB_APP_SERVER_CA, OFFICE_SERVER_TYPE
logger = logging.getLogger(__name__)
@@ -65,6 +65,16 @@ def get_wopi_dict(request_user, repo_id, file_path, action_name='view'):
file_name = os.path.basename(file_path)
file_ext = os.path.splitext(file_name)[1][1:].lower()
if OFFICE_SERVER_TYPE.lower() == 'collaboraoffice':
if file_ext == 'doc':
file_ext = 'docx'
if file_ext == 'ppt':
file_ext = 'pptx'
if file_ext == 'xls':
file_ext = 'xlsx'
wopi_key = generate_discovery_cache_key(action_name, file_ext)
action_url = cache.get(wopi_key)