Merge pull request #5069 from mdmontesinos/dev-test
fix #5058: ensure sequential file and chunk uploads to avoid overload
This commit is contained in:
commit
cec4b339f5
|
@ -320,7 +320,7 @@ Oqtane.Interop = {
|
||||||
}
|
}
|
||||||
let uploadSize = 0;
|
let uploadSize = 0;
|
||||||
|
|
||||||
if (!chunksize) {
|
if (!chunksize || chunksize < 1) {
|
||||||
chunksize = 1; // 1 MB default
|
chunksize = 1; // 1 MB default
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -336,8 +336,7 @@ Oqtane.Interop = {
|
||||||
progressbar.value = 0;
|
progressbar.value = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const uploadFiles = Array.from(fileinput.files).map(file => {
|
const uploadFile = (file) => {
|
||||||
const uploadFile = () => {
|
|
||||||
const chunkSize = chunksize * (1024 * 1024);
|
const chunkSize = chunksize * (1024 * 1024);
|
||||||
const totalParts = Math.ceil(file.size / chunkSize);
|
const totalParts = Math.ceil(file.size / chunkSize);
|
||||||
let partCount = 0;
|
let partCount = 0;
|
||||||
|
@ -400,11 +399,10 @@ Oqtane.Interop = {
|
||||||
return uploadPart();
|
return uploadPart();
|
||||||
};
|
};
|
||||||
|
|
||||||
return uploadFile();
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await Promise.all(uploadFiles);
|
for (const file of fileinput.files) {
|
||||||
|
await uploadFile(file);
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user