TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-23 19:02:29 +03:00
Code Issues Projects Releases Wiki Activity

Removed unecessaryly complex logic from exporter

Browse Source 
refs https://github.com/TryGhost/Team/issues/555

- The getVersionAndTables was doing too much and was only used once creating clutter in doExport method. Refactored code doing 2 direct calls instead of destructuring "dances".
This commit is contained in:
Naz 2021-03-25 15:01:54 +13:00
parent 2e9ec65b63
commit eccb15a988
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/server/data/exporter/index.js
View File

@ -57,15 +57,6 @@ const exportFileName = async function exportFileName(options) {
}
};
const getVersionAndTables = function getVersionAndTables(options) {
const props = {
version: ghostVersion.full,
tables: commands.getTables(options.transacting)
};
return Promise.props(props);
};
const exportTable = function exportTable(tableName, options) {
if (EXCLUDED_TABLES.indexOf(tableName) < 0 ||
(options.include && _.isArray(options.include) && options.include.indexOf(tableName) !== -1)) {
@ -84,14 +75,8 @@ const getSettingsTableData = function getSettingsTableData(settingsData) {
const doExport = async function doExport(options) {
options = options || {include: []};
let tables;
let version;
try {
const result = await getVersionAndTables(options);
tables = result.tables;
version = result.version;
const tables = await commands.getTables(options.transacting);
const tableData = await Promise.mapSeries(tables, function (tableName) {
return exportTable(tableName, options);
@ -100,14 +85,14 @@ const doExport = async function doExport(options) {
const exportData = {
meta: {
exported_on: new Date().getTime(),
version: version
version: ghostVersion.full
},
data: {
// Filled below
}
};
_.each(tables, function (name, i) {
tables.forEach((name, i) => {
if (name === 'settings') {
exportData.data[name] = getSettingsTableData(tableData[i]);
} else {