Skip to content

fix issues#28 #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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix issues#28 #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b895a
Merge pull request #1 from simple-uploader/develop
msidolphin Jan 16, 2019
0047fe7
fix issues#28
msidolphin Jan 16, 2019
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
48 changes: 25 additions & 23 deletions samples/Node.js/uploader-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,35 +102,37 @@ module.exports = flow = function(temporaryFolder) {
callback('invalid_uploader_request', null, null, null);
return;
}

var original_filename = files[$.fileParameterName]['originalFilename'];
var validation = validateRequest(chunkNumber, chunkSize, totalSize, identifier, filename, files[$.fileParameterName].size);
if (validation == 'valid') {
var chunkFilename = getChunkFilename(chunkNumber, identifier);

// Save the chunk (TODO: OVERWRITE)
fs.rename(files[$.fileParameterName].path, chunkFilename, function() {

// Do we have all the chunks?
var currentTestChunk = 1;
var numberOfChunks = Math.max(Math.floor(totalSize / (chunkSize * 1.0)), 1);
var testChunkExists = function() {
fs.exists(getChunkFilename(currentTestChunk, identifier), function(exists) {
if (exists) {
currentTestChunk++;
if (currentTestChunk > numberOfChunks) {
callback('done', filename, original_filename, identifier);
let tmpFileExist = fs.existsSync(files[$.fileParameterName].path)
if (tmpFileExist) {
fs.writeFile(chunkFilename, fs.readFileSync(files[$.fileParameterName].path), function() {
// Do we have all the chunks?
var currentTestChunk = 1;
var numberOfChunks = Math.max(Math.floor(totalSize / (chunkSize * 1.0)), 1);
var testChunkExists = function() {
fs.exists(getChunkFilename(currentTestChunk, identifier), function(exists) {
if (exists) {
currentTestChunk++;
if (currentTestChunk > numberOfChunks) {
callback('done', filename, original_filename, identifier);
} else {
// Recursion
testChunkExists();
}
} else {
// Recursion
testChunkExists();
callback('partly_done', filename, original_filename, identifier);
}
} else {
callback('partly_done', filename, original_filename, identifier);
}
});
};
testChunkExists();
});
});
};
testChunkExists();
})
} else {
callback('tmp file not exists', null, null, null);
}
} else {
callback(validation, filename, original_filename, identifier);
}
Expand Down