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

Merge pull request #4799 from haiwen/use-go-fileserver

Browse Source 
use go fileserver
This commit is contained in:
Daniel Pan 2021-06-07 11:13:55 +08:00 committed by GitHub
commit a38eab49b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/components/toolbar/multiple-dir-operation-toolbar.js
View File

@ -1,7 +1,7 @@
import React, { Fragment } from 'react'; import React, { Fragment } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Button, ButtonGroup } from 'reactstrap'; import { Button, ButtonGroup } from 'reactstrap';
import { gettext, siteRoot, canGenerateShareLink, isPro, fileAuditEnabled, name } from '../../utils/constants'; import { gettext, siteRoot, canGenerateShareLink, isPro, fileAuditEnabled, name, fileServerRoot, useGoFileserver } from '../../utils/constants';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import { seafileAPI } from '../../utils/seafile-api'; import { seafileAPI } from '../../utils/seafile-api';
import URLDecorator from '../../utils/url-decorator'; import URLDecorator from '../../utils/url-decorator';
@ -83,9 +83,23 @@ class MultipleDirOperationToolbar extends React.Component {
location.href= url; location.href= url;
return; return;
} }
if (!useGoFileserver) {
this.setState({ this.setState({
isZipDialogOpen: true isZipDialogOpen: true
}); });
} else {
const target = this.props.selectedDirentList.map(dirent => dirent.name);
seafileAPI.zipDownload(repoID, path, target).then((res) => {
const zipToken = res.data['zip_token'];
location.href = `${fileServerRoot}zip/${zipToken}`;
}).catch((error) => {
let errorMsg = Utils.getErrorMsg(error);
this.setState({
isLoading: false,
errorMsg: errorMsg
});
});
}
} }
} }

1
frontend/src/utils/constants.js
View File

@ -15,6 +15,7 @@ export const isPro = window.app.config.isPro === 'True';
export const isDocs = window.app.config.isDocs === 'True'; export const isDocs = window.app.config.isDocs === 'True';
export const lang = window.app.config.lang; export const lang = window.app.config.lang;
export const fileServerRoot = window.app.config.fileServerRoot; export const fileServerRoot = window.app.config.fileServerRoot;
export const useGoFileserver = window.app.config.useGoFileserver;
export const seafileVersion = window.app.config.seafileVersion; export const seafileVersion = window.app.config.seafileVersion;
export const serviceURL = window.app.config.serviceURL; export const serviceURL = window.app.config.serviceURL;
export const appAvatarURL = window.app.config.avatarURL; export const appAvatarURL = window.app.config.avatarURL;

3
seahub/base/context_processors.py
View File

@ -15,6 +15,8 @@ from django.conf import settings as dj_settings
from django.utils.functional import lazy from django.utils.functional import lazy
from constance import config from constance import config
import seaserv
from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \ from seahub.settings import SEAFILE_VERSION, SITE_TITLE, SITE_NAME, \
MAX_FILE_NAME, LOGO_PATH, BRANDING_CSS, LOGO_WIDTH, LOGO_HEIGHT,\ MAX_FILE_NAME, LOGO_PATH, BRANDING_CSS, LOGO_WIDTH, LOGO_HEIGHT,\
SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \ SHOW_REPO_DOWNLOAD_BUTTON, SITE_ROOT, ENABLE_GUEST_INVITATION, \
@ -132,6 +134,7 @@ def base(request):
'CSRF_COOKIE_NAME': dj_settings.CSRF_COOKIE_NAME, 'CSRF_COOKIE_NAME': dj_settings.CSRF_COOKIE_NAME,
'constance_enabled': dj_settings.CONSTANCE_ENABLED, 'constance_enabled': dj_settings.CONSTANCE_ENABLED,
'FILE_SERVER_ROOT': file_server_root, 'FILE_SERVER_ROOT': file_server_root,
'USE_GO_FILESERVER': seaserv.USE_GO_FILESERVER if hasattr(seaserv, 'USE_GO_FILESERVER') else False,
'LOGIN_URL': dj_settings.LOGIN_URL, 'LOGIN_URL': dj_settings.LOGIN_URL,
'LOGOUT_URL': dj_settings.LOGOUT_URL, 'LOGOUT_URL': dj_settings.LOGOUT_URL,
'enable_thumbnail': ENABLE_THUMBNAIL, 'enable_thumbnail': ENABLE_THUMBNAIL,

1
seahub/templates/base_for_react.html
View File

@ -45,6 +45,7 @@
isDocs: '{{ is_docs }}', isDocs: '{{ is_docs }}',
lang: '{{ LANGUAGE_CODE }}', lang: '{{ LANGUAGE_CODE }}',
fileServerRoot: '{{ FILE_SERVER_ROOT }}', fileServerRoot: '{{ FILE_SERVER_ROOT }}',
useGoFileserver: {% if USE_GO_FILESERVER %} true {% else %} false {% endif %},
serviceURL: '{{ service_url }}', serviceURL: '{{ service_url }}',
seafileVersion: '{{ seafile_version }}', seafileVersion: '{{ seafile_version }}',
avatarURL: '{{ avatar_url }}' avatarURL: '{{ avatar_url }}'