Skip to content

replace up.total.bytesPerSec with self-defined file.speed #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2015
Merged

replace up.total.bytesPerSec with self-defined file.speed #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ $(function() {
'UploadProgress': function(up, file) {
var progress = new FileProgress(file, 'fsUploadProgress');
var chunk_size = plupload.parseSize(this.getOption('chunk_size'));
progress.setProgress(file.percent + "%", up.total.bytesPerSec, chunk_size);

progress.setProgress(file.percent + "%", file.speed, chunk_size);
},
'UploadComplete': function() {
$('#success').show();
Expand Down
28 changes: 26 additions & 2 deletions demo/js/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@ function QiniuJsSDK() {
that.key_handler = typeof op.init.Key === 'function' ? op.init.Key : '';
this.domain = op.domain;
var ctx = '';
var speedCalInfo = {
isResumeUpload: false,
resumeFilesize: 0,
startTime: '',
currentTime: ''
};

var reset_chunk_size = function() {
var ie = that.detectIEVersion();
Expand Down Expand Up @@ -336,11 +342,11 @@ function QiniuJsSDK() {
});

uploader.bind('BeforeUpload', function(up, file) {

file.speed = file.speed || 0; // add a key named speed for file obj
ctx = '';

var directUpload = function(up, file, func) {

speedCalInfo.startTime = new Date().getTime();
var multipart_params_obj;
if (op.save_key) {
multipart_params_obj = {
Expand Down Expand Up @@ -392,9 +398,14 @@ function QiniuJsSDK() {
if (now - before < aDay) {
if (localFileInfo.percent !== 100) {
if (file.size === localFileInfo.total) {
// 通过文件名和文件大小匹配，找到对应的 localstorage 信息，恢复进度
file.percent = localFileInfo.percent;
file.loaded = localFileInfo.offset;
ctx = localFileInfo.ctx;

// 计算速度时，会用到
speedCalInfo.isResumeUpload = true;
speedCalInfo.resumeFilesize = localFileInfo.offset;
if (localFileInfo.offset + blockSize > file.size) {
blockSize = file.size - localFileInfo.offset;
}
Expand All @@ -410,6 +421,7 @@ function QiniuJsSDK() {
localStorage.removeItem(file.name);
}
}
speedCalInfo.startTime = new Date().getTime();
up.setOption({
'url': 'http://upload.qiniu.com/mkblk/' + blockSize,
'multipart': false,
Expand All @@ -426,6 +438,18 @@ function QiniuJsSDK() {
}
});

uploader.bind('UploadProgress', function(up, file) {
// 计算速度

speedCalInfo.currentTime = new Date().getTime();
var timeUsed = speedCalInfo.currentTime - speedCalInfo.startTime; // ms
var fileUploaded = file.loaded || 0;
if (speedCalInfo.isResumeUpload) {
fileUploaded = file.loaded - speedCalInfo.resumeFilesize;
}
file.speed = (fileUploaded / timeUsed * 1000).toFixed(0) || 0; // unit: byte/s
});

uploader.bind('ChunkUploaded', function(up, file, info) {
var res = that.parseJSON(info.response);

Expand Down
28 changes: 26 additions & 2 deletions src/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,12 @@ function QiniuJsSDK() {
that.key_handler = typeof op.init.Key === 'function' ? op.init.Key : '';
this.domain = op.domain;
var ctx = '';
var speedCalInfo = {
isResumeUpload: false,
resumeFilesize: 0,
startTime: '',
currentTime: ''
};

var reset_chunk_size = function() {
var ie = that.detectIEVersion();
Expand Down Expand Up @@ -336,11 +342,11 @@ function QiniuJsSDK() {
});

uploader.bind('BeforeUpload', function(up, file) {

file.speed = file.speed || 0; // add a key named speed for file obj
ctx = '';

var directUpload = function(up, file, func) {

speedCalInfo.startTime = new Date().getTime();
var multipart_params_obj;
if (op.save_key) {
multipart_params_obj = {
Expand Down Expand Up @@ -392,9 +398,14 @@ function QiniuJsSDK() {
if (now - before < aDay) {
if (localFileInfo.percent !== 100) {
if (file.size === localFileInfo.total) {
// 通过文件名和文件大小匹配，找到对应的 localstorage 信息，恢复进度
file.percent = localFileInfo.percent;
file.loaded = localFileInfo.offset;
ctx = localFileInfo.ctx;

// 计算速度时，会用到
speedCalInfo.isResumeUpload = true;
speedCalInfo.resumeFilesize = localFileInfo.offset;
if (localFileInfo.offset + blockSize > file.size) {
blockSize = file.size - localFileInfo.offset;
}
Expand All @@ -410,6 +421,7 @@ function QiniuJsSDK() {
localStorage.removeItem(file.name);
}
}
speedCalInfo.startTime = new Date().getTime();
up.setOption({
'url': 'http://upload.qiniu.com/mkblk/' + blockSize,
'multipart': false,
Expand All @@ -426,6 +438,18 @@ function QiniuJsSDK() {
}
});

uploader.bind('UploadProgress', function(up, file) {
// 计算速度

speedCalInfo.currentTime = new Date().getTime();
var timeUsed = speedCalInfo.currentTime - speedCalInfo.startTime; // ms
var fileUploaded = file.loaded || 0;
if (speedCalInfo.isResumeUpload) {
fileUploaded = file.loaded - speedCalInfo.resumeFilesize;
}
file.speed = (fileUploaded / timeUsed * 1000).toFixed(0) || 0; // unit: byte/s
});

uploader.bind('ChunkUploaded', function(up, file, info) {
var res = that.parseJSON(info.response);

Expand Down
Loading