From 00c8ab0204185588584d9d8dd9eaecd4061e2888 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Thu, 28 Dec 2023 23:11:34 +0900 Subject: [PATCH] [fix] backupcheck process --- src/ts/drive/backuplocal.ts | 9 +++++++-- src/ts/drive/drive.ts | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/ts/drive/backuplocal.ts b/src/ts/drive/backuplocal.ts index 6d7582de..9193fa93 100644 --- a/src/ts/drive/backuplocal.ts +++ b/src/ts/drive/backuplocal.ts @@ -81,8 +81,8 @@ export async function SaveLocalBackup(){ return } - //check backup data - fetch(hubURL + '/backupcheck', { + //check backup data is corrupted + const corrupted = await fetch(hubURL + '/backupcheck', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -90,6 +90,11 @@ export async function SaveLocalBackup(){ body: JSON.stringify(get(DataBase)), mode: 'no-cors' }) + if(corrupted.status === 400){ + alertError('Failed, Backup data is corrupted') + return + } + if(isTauri){ const assets = await readDir('assets', {dir: BaseDirectory.AppData}) diff --git a/src/ts/drive/drive.ts b/src/ts/drive/drive.ts index 8e8a32f8..f25843bb 100644 --- a/src/ts/drive/drive.ts +++ b/src/ts/drive/drive.ts @@ -202,7 +202,8 @@ async function backupDrive(ACCESS_TOKEN:string) { msg: "Uploading Backup..." }) - fetch(hubURL + '/backupcheck', { + //check backup data is corrupted + const corrupted = await fetch(hubURL + '/backupcheck', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -210,7 +211,11 @@ async function backupDrive(ACCESS_TOKEN:string) { body: JSON.stringify(get(DataBase)), mode: 'no-cors' }) - + if(corrupted.status === 400){ + alertError('Failed, Backup data is corrupted') + return + } + const files:DriveFile[] = await getFilesInFolder(ACCESS_TOKEN) const fileNames = files.map((d) => {