Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes wait window closing after first upload is complete and not waiting for all uploads to complete.

Browse Source
This commit is contained in:
Andrew 2021-08-23 18:22:35 -04:00
parent e9f5eae28b
commit ce4a7619a6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/classes/web/upload_handler.py
View File

@ -62,16 +62,18 @@ class UploadHandler(tornado.web.RequestHandler):
def post(self): def post(self):
logger.info("Upload completed") logger.info("Upload completed")
files_left = int(self.request.headers.get('X-Files-Left', None))
if self.do_upload: if self.do_upload:
time.sleep(5) time.sleep(5)
websocket_helper.broadcast('close_upload_box', 'success') if files_left == 0:
websocket_helper.broadcast('close_upload_box', 'success')
self.finish('success') # Nope, I'm sending "success" self.finish('success') # Nope, I'm sending "success"
self.f.close() self.f.close()
else: else:
time.sleep(5) time.sleep(5)
websocket_helper.broadcast('close_upload_box', 'error') if files_left == 0:
websocket_helper.broadcast('close_upload_box', 'error')
self.finish('error') self.finish('error')
def data_received(self, data): def data_received(self, data):

7
app/frontend/templates/panel/server_files.html
View File

@ -525,7 +525,7 @@
window.location.href = "/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=files" window.location.href = "/panel/server_detail?id={{ data['server_stats']['server_id']['server_id'] }}&subpage=files"
} }
function sendFile(file, path, server_id, onProgress){ function sendFile(file, path, server_id, left, onProgress){
var xmlHttpRequest = new XMLHttpRequest(); var xmlHttpRequest = new XMLHttpRequest();
var token = getCookie("_xsrf") var token = getCookie("_xsrf")
var fileName = file.name var fileName = file.name
@ -537,6 +537,7 @@
xmlHttpRequest.setRequestHeader('X-XSRFToken', token); xmlHttpRequest.setRequestHeader('X-XSRFToken', token);
xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"'); xmlHttpRequest.setRequestHeader('X-Content-Disposition', 'attachment; filename="' + fileName + '"');
xmlHttpRequest.setRequestHeader('X-Path', path); xmlHttpRequest.setRequestHeader('X-Path', path);
xmlHttpRequest.setRequestHeader('X-Files-Left', left);
xmlHttpRequest.setRequestHeader('X-FileName', fileName); xmlHttpRequest.setRequestHeader('X-FileName', fileName);
xmlHttpRequest.setRequestHeader('X-ServerId', "{{ data['server_stats']['server_id']['server_id'] }}"); xmlHttpRequest.setRequestHeader('X-ServerId', "{{ data['server_stats']['server_id']['server_id'] }}");
xmlHttpRequest.upload.addEventListener('progress', (event) => xmlHttpRequest.upload.addEventListener('progress', (event) =>
@ -620,7 +621,8 @@
</div><br> </div><br>
`; `;
$('#upload-progress-bar-parent').append(progressHtml); $('#upload-progress-bar-parent').append(progressHtml);
sendFile(files.files[i], path, server_id, (progress) => { console.log(files.files.length)
sendFile(files.files[i], path, server_id, files.files.length - i - 1, (progress) => {
$(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress) $(`#upload-progress-bar-${i + 1}`).attr('aria-valuenow', progress)
$(`#upload-progress-bar-${i + 1}`).css('width', progress + '%') $(`#upload-progress-bar-${i + 1}`).css('width', progress + '%')
}); });
@ -757,7 +759,6 @@
hideUploadBox(); hideUploadBox();
}); });
} }
function hideUploadBox(){ function hideUploadBox(){
if (!uploadWaitDialog) return; if (!uploadWaitDialog) return;
uploadWaitDialog.modal('hide'); uploadWaitDialog.modal('hide');