jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

settings: move backup settings

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-04 11:24:28 +05:30
parent 77c66d9a02
commit e73b75e4b5
20 changed files with 535 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backuptask.js
+5 -5
View File
@@ -82,7 +82,7 @@ async function upload(remotePath, format, dataLayoutString, progressCallback) {
debug(`upload: path ${remotePath} format ${format} dataLayout ${dataLayoutString}`);
const dataLayout = DataLayout.fromString(dataLayoutString);
const backupConfig = await settings.getBackupConfig();
const backupConfig = await backups.getConfig();
await checkPreconditions(backupConfig, dataLayout);
@@ -131,7 +131,7 @@ async function downloadApp(app, restoreConfig, progressCallback) {
const dataLayout = new DataLayout(appDataDir, app.storageVolumeId ? [{ localDir: await apps.getStorageDir(app), remoteDir: 'data' }] : []);
const startTime = new Date();
const backupConfig = restoreConfig.backupConfig || await settings.getBackupConfig();
const backupConfig = restoreConfig.backupConfig || await backups.getConfig();
await download(backupConfig, restoreConfig.remotePath, restoreConfig.backupFormat, dataLayout, progressCallback);
debug('downloadApp: time: %s', (new Date() - startTime)/1000);
@@ -267,7 +267,7 @@ async function backupBox(dependsOn, tag, options, progressCallback) {
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof progressCallback, 'function');
const backupConfig = await settings.getBackupConfig();
const backupConfig = await backups.getConfig();
await uploadBoxSnapshot(backupConfig, progressCallback);
return await rotateBoxBackup(backupConfig, tag, options, dependsOn, progressCallback);
@@ -381,7 +381,7 @@ async function backupAppWithTag(app, tag, options, progressCallback) {
return results[0].id;
}
const backupConfig = await settings.getBackupConfig();
const backupConfig = await backups.getConfig();
await uploadAppSnapshot(backupConfig, app, progressCallback);
return await rotateAppBackup(backupConfig, app, tag, options, progressCallback);
@@ -452,7 +452,7 @@ async function backupMailWithTag(tag, options, progressCallback) {
debug(`backupMailWithTag: backing up mail with tag ${tag}`);
const backupConfig = await settings.getBackupConfig();
const backupConfig = await backups.getConfig();
await uploadMailSnapshot(backupConfig, progressCallback);
return await rotateMailBackup(backupConfig, tag, options, progressCallback);
}