From 0104f29ff1695e3d864db0def5bd427460a6ff9a Mon Sep 17 00:00:00 2001 From: lian Date: Sat, 19 Jan 2019 12:32:47 +0800 Subject: [PATCH] add RESUMABLE_UPLOAD_FILE_BLOCK_SIZE setting (#2744) --- seahub/settings.py | 1 + seahub/templates/libraries.html | 1 + seahub/views/__init__.py | 1 + static/scripts/app/views/fileupload.js | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/seahub/settings.py b/seahub/settings.py index b099df210d..1ecc4e78e0 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -297,6 +297,7 @@ ENABLE_UPLOAD_FOLDER = True # enable resumable fileupload or not ENABLE_RESUMABLE_FILEUPLOAD = False +RESUMABLE_UPLOAD_FILE_BLOCK_SIZE = 8 ## maxNumberOfFiles for fileupload MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD = 1000 diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html index 7e548db695..5b7c0756cc 100644 --- a/seahub/templates/libraries.html +++ b/seahub/templates/libraries.html @@ -285,6 +285,7 @@ app["pageOptions"] = { enable_wiki: {% if enable_wiki %} true {% else %} false {% endif %}, enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %}, enable_resumable_fileupload: {% if enable_resumable_fileupload %} true {% else %} false {% endif %}, + resumable_upload_file_block_size: {{ resumable_upload_file_block_size }}, max_number_of_files_for_fileupload: {{ max_number_of_files_for_fileupload }}, enable_thumbnail: {% if enable_thumbnail %} true {% else %} false {% endif %}, thumbnail_default_size: {{ thumbnail_default_size }}, diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 10bc391495..65b367fc15 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -713,6 +713,7 @@ def libraries(request): 'enable_wiki': settings.ENABLE_WIKI, 'enable_upload_folder': settings.ENABLE_UPLOAD_FOLDER, 'enable_resumable_fileupload': settings.ENABLE_RESUMABLE_FILEUPLOAD, + 'resumable_upload_file_block_size': settings.RESUMABLE_UPLOAD_FILE_BLOCK_SIZE, 'max_number_of_files_for_fileupload': settings.MAX_NUMBER_OF_FILES_FOR_FILEUPLOAD, 'enable_thumbnail': settings.ENABLE_THUMBNAIL, 'enable_repo_snapshot_label': settings.ENABLE_REPO_SNAPSHOT_LABEL, diff --git a/static/scripts/app/views/fileupload.js b/static/scripts/app/views/fileupload.js index 9d55429ee6..bd4622919f 100644 --- a/static/scripts/app/views/fileupload.js +++ b/static/scripts/app/views/fileupload.js @@ -192,7 +192,7 @@ define([ data.jqXHR = popup.fileupload('send', data); } else { - var block_size = 1024 * 1024; + var block_size = app.pageOptions.resumable_upload_file_block_size * 1024 * 1024; if (enable_resumable_fileupload && file.size && file.size > block_size) { popup.fileupload('option', 'maxChunkSize', block_size);