From 3b62f261f993f309cc5cf0512f356c64be434538 Mon Sep 17 00:00:00 2001 From: nobody Date: Wed, 17 Feb 2021 07:02:14 +0100 Subject: [PATCH] Optimized import method --- core/storage-manager.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/core/storage-manager.js b/core/storage-manager.js index 8f09c081..a6b06d1a 100644 --- a/core/storage-manager.js +++ b/core/storage-manager.js @@ -107,16 +107,23 @@ storageManager.startImportFilePicker = function () { input.click(); }; -storageManager.handleImportFilePicker = async function () { - try { - let file = document.getElementById('import-file-picker').files[0]; - let content = await storageManager._readFileAsync(file); - storageManager._validation(JSON.parse(content)); - } catch (err) { - console.error('[ LocalCDN ] ' + err); - } +storageManager.handleImportFilePicker = function () { + return new Promise((resolve) => { + try { + let file = document.getElementById('import-file-picker').files[0]; + storageManager._readFile(file) + .then(JSON.parse) + .then(storageManager._validation); + resolve(); + + } catch (err) { + console.error(`[ LocalCDN ] ${err}`); + alert(err); + } + }); }; + /** * Private Methods */ @@ -131,7 +138,7 @@ storageManager._handleStorageChanged = function (type) { } }; -storageManager._readFileAsync = function (file) { +storageManager._readFile = function (file) { return new Promise((resolve, reject) => { let reader = new FileReader(); reader.onload = () => {