diff --git a/src/apps.js b/src/apps.js index 86a9b68b2..05d688f3c 100644 --- a/src/apps.js +++ b/src/apps.js @@ -95,8 +95,8 @@ exports = module.exports = { downloadFile, uploadFile, - backupConfig, - restoreConfig, + writeConfig, + loadConfig, PORT_TYPE_TCP: 'tcp', PORT_TYPE_UDP: 'udp', @@ -2854,7 +2854,7 @@ async function uploadFile(app, sourceFilePath, destFilePath) { }); } -async function backupConfig(app) { +async function writeConfig(app) { assert.strictEqual(typeof app, 'object'); if (!safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'), JSON.stringify(app, null, 4))) { @@ -2865,7 +2865,7 @@ async function backupConfig(app) { if (!error && icons.icon) safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/icon.png'), icons.icon); } -async function restoreConfig(app) { +async function loadConfig(app) { assert.strictEqual(typeof app, 'object'); const appConfig = safe.JSON.parse(safe.fs.readFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'))); diff --git a/src/apptask.js b/src/apptask.js index fd48d544f..9f59e7ba2 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -313,7 +313,7 @@ async function install(app, args, progressCallback) { await progressCallback({ percent: 60, message: 'Importing addons in-place' }); await services.setupAddons(app, app.manifest.addons); await services.clearAddons(app, _.omit(app.manifest.addons, 'localstorage')); - await apps.restoreConfig(app); + await apps.loadConfig(app); await services.restoreAddons(app, app.manifest.addons); } else if (app.installationState === apps.ISTATE_PENDING_IMPORT) { // import await progressCallback({ percent: 65, message: 'Downloading backup and restoring addons' }); @@ -324,7 +324,7 @@ async function install(app, args, progressCallback) { if (mountObject) await progressCallback({ percent: 70, message: 'Setting up mount for importing' }); backupConfig.rootPath = backups.getRootPath(backupConfig, `/mnt/appimport-${app.id}`); await backuptask.downloadApp(app, restoreConfig, (progress) => { progressCallback({ percent: 75, message: progress.message }); }); - await apps.restoreConfig(app); + await apps.loadConfig(app); if (mountObject) await mounts.removeMount(mountObject); await progressCallback({ percent: 75, message: 'Restoring addons' }); await services.restoreAddons(app, app.manifest.addons); diff --git a/src/backuptask.js b/src/backuptask.js index fb8c26ea9..ca10abb88 100644 --- a/src/backuptask.js +++ b/src/backuptask.js @@ -328,7 +328,7 @@ async function snapshotApp(app, progressCallback) { const startTime = new Date(); progressCallback({ message: `Snapshotting app ${app.fqdn}` }); - await apps.backupConfig(app); + await apps.writeConfig(app); await services.backupAddons(app, app.manifest.addons); debug(`snapshotApp: ${app.fqdn} took ${(new Date() - startTime)/1000} seconds`);