backup: rename back backuplisting.js to backups.js
this was a transitional rename till I figured out how to split it in backuptargets.js
This commit is contained in:
+19
-19
@@ -17,7 +17,7 @@ exports = module.exports = {
|
||||
const apps = require('./apps.js'),
|
||||
assert = require('assert'),
|
||||
backupFormat = require('./backupformat.js'),
|
||||
backupListing = require('./backuplisting.js'),
|
||||
backups = require('./backups.js'),
|
||||
backupTargets = require('./backuptargets.js'),
|
||||
BoxError = require('./boxerror.js'),
|
||||
constants = require('./constants.js'),
|
||||
@@ -235,19 +235,19 @@ async function rotateBoxBackup(backupTarget, tag, options, dependsOn, progressCa
|
||||
remotePath,
|
||||
encryptionVersion: backupTarget.encryption ? 2 : null,
|
||||
packageVersion: constants.VERSION,
|
||||
type: backupListing.BACKUP_TYPE_BOX,
|
||||
state: backupListing.BACKUP_STATE_CREATING,
|
||||
identifier: backupListing.BACKUP_IDENTIFIER_BOX,
|
||||
type: backups.BACKUP_TYPE_BOX,
|
||||
state: backups.BACKUP_STATE_CREATING,
|
||||
identifier: backups.BACKUP_IDENTIFIER_BOX,
|
||||
dependsOn,
|
||||
manifest: null,
|
||||
preserveSecs: options.preserveSecs || 0,
|
||||
appConfig: null
|
||||
};
|
||||
|
||||
const id = await backupListing.add(data);
|
||||
const id = await backups.add(data);
|
||||
const [error] = await safe(copy(backupTarget, 'snapshot/box', remotePath, progressCallback));
|
||||
const state = error ? backupListing.BACKUP_STATE_ERROR : backupListing.BACKUP_STATE_NORMAL;
|
||||
await backupListing.setState(id, state);
|
||||
const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL;
|
||||
await backups.setState(id, state);
|
||||
if (error) throw error;
|
||||
|
||||
return id;
|
||||
@@ -282,8 +282,8 @@ async function rotateAppBackup(backupTarget, app, tag, options, progressCallback
|
||||
remotePath,
|
||||
encryptionVersion: backupTarget.encryption ? 2 : null,
|
||||
packageVersion: manifest.version,
|
||||
type: backupListing.BACKUP_TYPE_APP,
|
||||
state: backupListing.BACKUP_STATE_CREATING,
|
||||
type: backups.BACKUP_TYPE_APP,
|
||||
state: backups.BACKUP_STATE_CREATING,
|
||||
identifier: app.id,
|
||||
dependsOn: [],
|
||||
manifest,
|
||||
@@ -291,10 +291,10 @@ async function rotateAppBackup(backupTarget, app, tag, options, progressCallback
|
||||
appConfig: app
|
||||
};
|
||||
|
||||
const id = await backupListing.add(data);
|
||||
const id = await backups.add(data);
|
||||
const [error] = await safe(copy(backupTarget, `snapshot/app_${app.id}`, remotePath, progressCallback));
|
||||
const state = error ? backupListing.BACKUP_STATE_ERROR : backupListing.BACKUP_STATE_NORMAL;
|
||||
await backupListing.setState(id, state);
|
||||
const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL;
|
||||
await backups.setState(id, state);
|
||||
if (error) throw error;
|
||||
|
||||
return id;
|
||||
@@ -371,7 +371,7 @@ async function backupAppWithTag(app, backupTarget, tag, options, progressCallbac
|
||||
assert.strictEqual(typeof progressCallback, 'function');
|
||||
|
||||
if (!apps.canBackupApp(app)) { // if we cannot backup, reuse it's most recent backup
|
||||
const results = await backupListing.getByIdentifierAndStatePaged(app.id, backupListing.BACKUP_STATE_NORMAL, 1, 1);
|
||||
const results = await backups.getByIdentifierAndStatePaged(app.id, backups.BACKUP_STATE_NORMAL, 1, 1);
|
||||
if (results.length === 0) return null; // no backup to re-use
|
||||
|
||||
return results[0].id;
|
||||
@@ -420,19 +420,19 @@ async function rotateMailBackup(target, tag, options, progressCallback) {
|
||||
remotePath,
|
||||
encryptionVersion: target.encryption ? 2 : null,
|
||||
packageVersion: constants.VERSION,
|
||||
type: backupListing.BACKUP_TYPE_MAIL,
|
||||
state: backupListing.BACKUP_STATE_CREATING,
|
||||
identifier: backupListing.BACKUP_IDENTIFIER_MAIL,
|
||||
type: backups.BACKUP_TYPE_MAIL,
|
||||
state: backups.BACKUP_STATE_CREATING,
|
||||
identifier: backups.BACKUP_IDENTIFIER_MAIL,
|
||||
dependsOn: [],
|
||||
manifest: null,
|
||||
preserveSecs: options.preserveSecs || 0,
|
||||
appConfig: null
|
||||
};
|
||||
|
||||
const id = await backupListing.add(data);
|
||||
const id = await backups.add(data);
|
||||
const [error] = await safe(copy(target, 'snapshot/mail', remotePath, progressCallback));
|
||||
const state = error ? backupListing.BACKUP_STATE_ERROR : backupListing.BACKUP_STATE_NORMAL;
|
||||
await backupListing.setState(id, state);
|
||||
const state = error ? backups.BACKUP_STATE_ERROR : backups.BACKUP_STATE_NORMAL;
|
||||
await backups.setState(id, state);
|
||||
if (error) throw error;
|
||||
|
||||
return id;
|
||||
|
||||
Reference in New Issue
Block a user