mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-25 01:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

File loading progress is now updated

Browse source
This commit is contained in:
n1474335 2022-11-04 18:29:53 +00:00
parent 44c7a1e92d
commit 61d4c0ea63
3 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/web/waiters/InputWaiter.mjs
View file

@ -49,6 +49,7 @@ class InputWaiter {
this.maxTabs = this.manager.tabs.calcMaxTabs();
this.callbacks = {};
this.callbackID = 0;
this.fileDetails = {};
this.maxWorkers = 1;
if (navigator.hardwareConcurrency !== undefined &&
@ -542,15 +543,16 @@ class InputWaiter {
if (inputNum !== activeTab) return;
// Create file details panel
this.fileDetails = {
fileDetails: inputData.file,
progress: inputData.progress,
status: inputData.status,
buffer: inputData.buffer,
renderPreview: this.app.options.imagePreview
};
this.inputEditorView.dispatch({
effects: this.inputEditorConf.fileDetailsPanel.reconfigure(
fileDetailsPanel({
fileDetails: inputData.file,
progress: inputData.progress,
status: inputData.status,
buffer: inputData.buffer,
renderPreview: this.app.options.imagePreview
})
fileDetailsPanel(this.fileDetails)
)
});
}
@ -599,19 +601,16 @@ class InputWaiter {
* @param {number | string} progress - Either a number or "error"
*/
updateFileProgress(inputNum, progress) {
// const activeTab = this.manager.tabs.getActiveTab("input");
// if (inputNum !== activeTab) return;
const activeTab = this.manager.tabs.getActiveTab("input");
if (inputNum !== activeTab) return;
// TODO
// const fileLoaded = document.getElementById("input-file-loaded");
// if (progress === "error") {
// fileLoaded.textContent = "Error";
// fileLoaded.style.color = "#FF0000";
// } else {
// fileLoaded.textContent = progress + "%";
// fileLoaded.style.color = "";
// }
this.fileDetails.progress = progress;
if (progress === "error") this.fileDetails.status = "error";
this.inputEditorView.dispatch({
effects: this.inputEditorConf.fileDetailsPanel.reconfigure(
fileDetailsPanel(this.fileDetails)
)
});
}
/**