Code optimizations

This commit is contained in:
Ponkhy 2021-09-02 16:13:31 +02:00
parent 2dd392e609
commit 7d70c4d8cd
2 changed files with 7 additions and 10 deletions

View file

@ -556,14 +556,12 @@ let indexHTML = fs.readFileSync("./dist/index.html").toString();
try { try {
checkLogin(socket) checkLogin(socket)
console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${uploadedJSON[0]}`) let backupData = JSON.parse(uploadedJSON);
let notificationList = uploadedJSON[1]; console.log(`Importing Backup, User ID: ${socket.userID}, Version: ${backupData.version}`)
let monitorList = uploadedJSON[2];
monitorList = JSON.stringify(monitorList); let notificationList = backupData.notificationList;
monitorList = JSON.parse(monitorList); let monitorList = backupData.monitorList;
monitorList = Object.values(monitorList);
if (notificationList.length >= 1) { if (notificationList.length >= 1) {
for (let i = 0; i < notificationList.length; i++) { for (let i = 0; i < notificationList.length; i++) {

View file

@ -304,10 +304,11 @@ export default {
downloadBackup() { downloadBackup() {
let time = dayjs().format("YYYY_MM_DD-hh_mm_ss"); let time = dayjs().format("YYYY_MM_DD-hh_mm_ss");
let fileName = `Uptime_Kuma_Backup_${time}.json`; let fileName = `Uptime_Kuma_Backup_${time}.json`;
let monitorList = Object.values(this.$root.monitorList);
let exportData = { let exportData = {
version: this.$root.info.version, version: this.$root.info.version,
notificationList: this.$root.notificationList, notificationList: this.$root.notificationList,
monitorList: this.$root.monitorList, monitorList: monitorList,
} }
exportData = JSON.stringify(exportData); exportData = JSON.stringify(exportData);
let downloadItem = document.createElement("a"); let downloadItem = document.createElement("a");
@ -326,9 +327,7 @@ export default {
fileReader.readAsText(uploadItem.item(0)); fileReader.readAsText(uploadItem.item(0));
fileReader.onload = item => { fileReader.onload = item => {
let resultParse = JSON.parse(item.target.result); this.$root.uploadBackup(item.target.result, (res) => {
let result = Object.values(resultParse);
this.$root.uploadBackup(result, (res) => {
if (res.ok) { if (res.ok) {
toast.success(res.msg); toast.success(res.msg);
} else { } else {