bin scripts: Use destructuring instead of long condition checks

This commit is contained in:
Richard Hansen 2021-01-09 02:28:45 -05:00 committed by John McLear
parent f03c4bd7f7
commit 92cd2cc760
3 changed files with 6 additions and 8 deletions

View file

@ -66,13 +66,13 @@ npm.load({}, async () => {
} }
// check if there is a atext in the keyRevisions // check if there is a atext in the keyRevisions
if (revisions[keyRev].meta == null || revisions[keyRev].meta.atext == null) { let {meta: {atext} = {}} = revisions[keyRev];
if (atext == null) {
console.error(`[${pad.id}] Missing atext in revision ${keyRev}`); console.error(`[${pad.id}] Missing atext in revision ${keyRev}`);
continue; continue;
} }
const apool = pad.pool; const apool = pad.pool;
let atext = revisions[keyRev].meta.atext;
for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) { for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) {
try { try {
const cs = revisions[rev].changeset; const cs = revisions[rev].changeset;

View file

@ -62,15 +62,13 @@ npm.load({}, async () => {
if (pad.pool == null) throw new Error('Attribute pool is missing'); if (pad.pool == null) throw new Error('Attribute pool is missing');
// check if there is an atext in the keyRevisions // check if there is an atext in the keyRevisions
if (revisions[keyRev] == null || let {meta: {atext} = {}} = revisions[keyRev] || {};
revisions[keyRev].meta == null || if (atext == null) {
revisions[keyRev].meta.atext == null) {
console.error(`No atext in key revision ${keyRev}`); console.error(`No atext in key revision ${keyRev}`);
continue; continue;
} }
const apool = pad.pool; const apool = pad.pool;
let atext = revisions[keyRev].meta.atext;
for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) { for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) {
checkRevisionCount++; checkRevisionCount++;

View file

@ -54,8 +54,8 @@ npm.load({}, async () => {
// console.log('Fetching', revNum) // console.log('Fetching', revNum)
const revision = await db.get(`pad:${padId}:revs:${revNum}`); const revision = await db.get(`pad:${padId}:revs:${revNum}`);
// check if there is a atext in the keyRevisions // check if there is a atext in the keyRevisions
if (~keyRevisions.indexOf(revNum) && const {meta: {atext: revAtext} = {}} = revision || {};
(revision == null || revision.meta == null || revision.meta.atext == null)) { if (~keyRevisions.indexOf(revNum) && revAtext == null) {
console.error(`No atext in key revision ${revNum}`); console.error(`No atext in key revision ${revNum}`);
continue; continue;
} }