kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve polling in file upload to use actual file sizes to calculate duration

Browse Source
This commit is contained in:
sbwalker 2023-09-08 17:16:09 -04:00
parent 8c88cec863
commit 9267efce01
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -341,7 +341,8 @@
string restricted = ""; string restricted = "";
foreach (var upload in uploads) foreach (var upload in uploads)
{ {
var extension = (upload.LastIndexOf(".") != -1) ? upload.Substring(upload.LastIndexOf(".") + 1) : ""; var filename = upload.Split(':')[0];
var extension = (filename.LastIndexOf(".") != -1) ? filename.Substring(filename.LastIndexOf(".") + 1) : "";
if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower())) if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
{ {
restricted += (restricted == "" ? "" : ",") + extension; restricted += (restricted == "" ? "" : ",") + extension;
@ -368,24 +369,27 @@
while (upload < uploads.Length && success) while (upload < uploads.Length && success)
{ {
success = false; success = false;
// note that progressive retry will only wait a maximum of 15 seconds which may not be long enough for very large file uploads var filename = uploads[upload].Split(':')[0];
var size = Int64.Parse(uploads[upload].Split(':')[1]);
var maxattempts = (int)Math.Ceiling(size / 500000.0) + 1; // 30 MB takes 1 minute at 5 Mbps
int attempts = 0; int attempts = 0;
while (attempts < 5 && !success) while (attempts < maxattempts && !success)
{ {
attempts += 1; attempts += 1;
Thread.Sleep(1000 * attempts); // progressive retry Thread.Sleep(1000);
if (Folder == Constants.PackagesFolder) if (Folder == Constants.PackagesFolder)
{ {
var files = await FileService.GetFilesAsync(folder); var files = await FileService.GetFilesAsync(folder);
if (files != null && files.Any(item => item.Name == uploads[upload])) if (files != null && files.Any(item => item.Name == filename))
{ {
success = true; success = true;
} }
} }
else else
{ {
var file = await FileService.GetFileAsync(int.Parse(folder), uploads[upload]); var file = await FileService.GetFileAsync(int.Parse(folder), filename);
if (file != null) if (file != null)
{ {
success = true; success = true;
@ -433,7 +437,7 @@
else else
{ {
// set FileId to first file in upload collection // set FileId to first file in upload collection
var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0]); var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0].Split(":")[0]);
if (file != null) if (file != null)
{ {
FileId = file.FileId; FileId = file.FileId;

2
Oqtane.Server/wwwroot/js/interop.js
View File

@ -279,7 +279,7 @@ Oqtane.Interop = {
var fileinput = document.getElementById(id); var fileinput = document.getElementById(id);
if (fileinput !== null) { if (fileinput !== null) {
for (var i = 0; i < fileinput.files.length; i++) { for (var i = 0; i < fileinput.files.length; i++) {
files.push(fileinput.files[i].name); files.push(fileinput.files[i].name + ":" + fileinput.files[i].size);
} }
} }
return files; return files;