Merge branch 'master' into mf/rssInboundManager

This commit is contained in:
mfcar 2023-10-01 00:34:38 +01:00
commit 4de5b92fa7
No known key found for this signature in database
44 changed files with 991 additions and 109 deletions

View file

@ -100,7 +100,7 @@ class BackupManager {
let entries
try {
entries = await zip.entries()
} catch(error){
} catch (error) {
// Not a valid zip file
Logger.error('[BackupManager] Failed to read backup file - backup might not be a valid .zip file', tempPath, error)
return res.status(400).send('Failed to read backup file - backup might not be a valid .zip file')
@ -182,7 +182,6 @@ class BackupManager {
data = await zip.entryData('details')
} catch (error) {
Logger.error(`[BackupManager] Failed to unzip backup "${fullFilePath}"`, error)
await zip.close()
continue
}