haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-06 17:33:18 +00:00
Code Issues Releases Wiki Activity

repair upload file which size is 0 bug (#4015)

Browse Source
This commit is contained in:
杨顺强
2019-08-22 16:59:44 +08:00
committed by Daniel Pan
parent 3e65a3a313
commit 2b9257acf9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/file-uploader/file-uploader.js
View File

@@ -43,7 +43,7 @@ class FileUploader extends React.Component {
isUploadProgressDialogShow: false, isUploadProgressDialogShow: false,
isUploadRemindDialogShow: false, isUploadRemindDialogShow: false,
currentResumableFile: null, currentResumableFile: null,
uploadBitrate: '0', uploadBitrate: 0,
allFilesUploaded: false, allFilesUploaded: false,
}; };
@@ -74,6 +74,7 @@ class FileUploader extends React.Component {
generateUniqueIdentifier: this.generateUniqueIdentifier, generateUniqueIdentifier: this.generateUniqueIdentifier,
forceChunkSize: true, forceChunkSize: true,
maxChunkRetries: 3, maxChunkRetries: 3,
minFileSize: 0,
}); });
this.resumable.assignBrowse(this.uploadInput.current, true); this.resumable.assignBrowse(this.uploadInput.current, true);
@@ -410,7 +411,7 @@ class FileUploader extends React.Component {
setHeaders = (resumableFile, resumable) => { setHeaders = (resumableFile, resumable) => {
let offset = resumable.offset; let offset = resumable.offset;
let chunkSize = resumable.getOpt('chunkSize'); let chunkSize = resumable.getOpt('chunkSize');
let fileSize = resumableFile.size; let fileSize = resumableFile.size === 0 ? 1 : resumableFile.size;
let startByte = offset !== 0 ? offset * chunkSize : 0; let startByte = offset !== 0 ? offset * chunkSize : 0;
let endByte = Math.min(fileSize, (offset + 1) * chunkSize) - 1; let endByte = Math.min(fileSize, (offset + 1) * chunkSize) - 1;
@@ -594,7 +595,6 @@ class FileUploader extends React.Component {
var firedRetry = false; var firedRetry = false;
resumableFile.resumableObj.on('chunkingComplete', () => { resumableFile.resumableObj.on('chunkingComplete', () => {
if(!firedRetry) { if(!firedRetry) {
console.log(path);
seafileAPI.getFileUploadedBytes(repoID, path, fileName).then(res => { seafileAPI.getFileUploadedBytes(repoID, path, fileName).then(res => {
let uploadedBytes = res.data.uploadedBytes; let uploadedBytes = res.data.uploadedBytes;
let blockSize = parseInt(resumableUploadFileBlockSize) * 1024 * 1024 || 1024 * 1024; let blockSize = parseInt(resumableUploadFileBlockSize) * 1024 * 1024 || 1024 * 1024;

2
frontend/src/components/file-uploader/upload-progress-dialog.js
View File

@@ -5,7 +5,7 @@ import UploadListItem from './upload-list-item';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
const propTypes = { const propTypes = {
uploadBitrate: PropTypes.string.isRequired, uploadBitrate: PropTypes.number.isRequired,
totalProgress: PropTypes.number.isRequired, totalProgress: PropTypes.number.isRequired,
retryFileList: PropTypes.array.isRequired, retryFileList: PropTypes.array.isRequired,
uploadFileList: PropTypes.array.isRequired, uploadFileList: PropTypes.array.isRequired,