Skip to content

11087 fix offset bug when reupload #32

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 2 commits into from
Sep 11, 2014
Merged

11087 fix offset bug when reupload #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
258e47d
fix localFileInfo.offset bug
SunLn Sep 11, 2014
aa56620
add a time limit to prevent 599 short-write bug
SunLn Sep 11, 2014
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
20 changes: 14 additions & 6 deletions src/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,11 +386,18 @@ function QiniuJsSDK() {
var blockSize = chunk_size;
if (localFileInfo) {
localFileInfo = JSON.parse(localFileInfo);
file.loaded = localFileInfo.offset;
file.percent = localFileInfo.percent;
ctx = localFileInfo.ctx;
if (localFileInfo.offset + blockSize > file.size) {
blockSize = file.size - localFileInfo.ctx;
var now = (new Date()).getTime();
var before = localFileInfo.time || 0;
var aDay = 24 * 60 * 60 * 1000; // milliseconds
if (now - before < aDay) {
file.loaded = localFileInfo.offset;
file.percent = localFileInfo.percent;
ctx = localFileInfo.ctx;
if (localFileInfo.offset + blockSize > file.size) {
blockSize = file.size - localFileInfo.offset;
}
} else {
localStorage.removeItem(file.name);
}
}
up.setOption({
Expand Down Expand Up @@ -425,7 +432,8 @@ function QiniuJsSDK() {
ctx: ctx,
percent: file.percent,
total: info.total,
offset: info.offset
offset: info.offset,
time: (new Date()).getTime()
}));
});

Expand Down
Loading