utility scripts: converted to use the Promise interface

This commit is contained in:
Ray Bellis 2019-01-26 23:52:02 +00:00
parent e7dc0766fd
commit 7709fd46e5
4 changed files with 202 additions and 318 deletions

View file

@ -7,128 +7,88 @@ if (process.argv.length != 2) {
process.exit(1); process.exit(1);
} }
// initialize the variables // load and initialize NPM
var db, settings, padManager; let npm = require('../src/node_modules/npm');
var npm = require('../src/node_modules/npm'); npm.load({}, async function() {
var async = require('../src/node_modules/async');
var Changeset = require('../src/static/js/Changeset'); try {
// initialize the database
async.series([ let settings = require('../src/node/utils/Settings');
// load npm let db = require('../src/node/db/DB');
function(callback) { await db.init();
npm.load({}, callback);
},
// load modules // load modules
function(callback) { let Changeset = require('../src/static/js/Changeset');
settings = require('../src/node/utils/Settings'); let padManager = require('../src/node/db/PadManager');
db = require('../src/node/db/DB');
// initialize the database // get all pads
db.init(callback); let res = await padManager.listAllPads();
},
// load pads for (let padId of res.padIDs) {
function (callback) {
padManager = require('../src/node/db/PadManager');
padManager.listAllPads(function(err, res) { let pad = await padManager.getPad(padId);
padIds = res.padIDs;
callback(err);
});
},
function (callback) {
async.forEach(padIds, function(padId, callback) {
padManager.getPad(padId, function(err, pad) {
if (err) {
callback(err);
}
// check if the pad has a pool // check if the pad has a pool
if (pad.pool === undefined ) { if (pad.pool === undefined) {
console.error("[" + pad.id + "] Missing attribute pool"); console.error("[" + pad.id + "] Missing attribute pool");
callback(); continue;
return;
} }
// create an array with key kevisions // create an array with key kevisions
// key revisions always save the full pad atext // key revisions always save the full pad atext
var head = pad.getHeadRevisionNumber(); let head = pad.getHeadRevisionNumber();
var keyRevisions = []; let keyRevisions = [];
for (var i = 0; i < head; i += 100) { for (let rev = 0; rev < head; rev += 100) {
keyRevisions.push(i); keyRevisions.push(rev);
} }
// run through all key revisions // run through all key revisions
async.forEachSeries(keyRevisions, function(keyRev, callback) { for (let keyRev of keyRevisions) {
// create an array of revisions we need till the next keyRevision or the End // create an array of revisions we need till the next keyRevision or the End
var revisionsNeeded = []; var revisionsNeeded = [];
for (let rev = keyRev ; rev <= keyRev + 100 && rev <= head; rev++) {
for(var i = keyRev; i <= keyRev + 100 && i <= head; i++) { revisionsNeeded.push(rev);
revisionsNeeded.push(i);
} }
// this array will hold all revision changesets // this array will hold all revision changesets
var revisions = []; var revisions = [];
// run through all needed revisions and get them from the database // run through all needed revisions and get them from the database
async.forEach(revisionsNeeded, function(revNum, callback) { for (let revNum of revisionsNeeded) {
db.db.get("pad:" + pad.id + ":revs:" + revNum, function(err, revision) { let revision = await db.get("pad:" + pad.id + ":revs:" + revNum);
revisions[revNum] = revision; revisions[revNum] = revision;
callback(err);
});
},
function(err) {
if (err) {
callback(err);
return;
} }
// check if the revision exists // check if the revision exists
if (revisions[keyRev] == null) { if (revisions[keyRev] == null) {
console.error("[" + pad.id + "] Missing revision " + keyRev); console.error("[" + pad.id + "] Missing revision " + keyRev);
callback(); continue;
return;
} }
// check if there is a atext in the keyRevisions // check if there is a atext in the keyRevisions
if (revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) { if (revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) {
console.error("[" + pad.id + "] Missing atext in revision " + keyRev); console.error("[" + pad.id + "] Missing atext in revision " + keyRev);
callback(); continue;
return;
} }
var apool = pad.pool; let apool = pad.pool;
var atext = revisions[keyRev].meta.atext; let atext = revisions[keyRev].meta.atext;
for(var i = keyRev + 1; i <= keyRev + 100 && i <= head; i++) { for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) {
try { try {
// console.log("[" + pad.id + "] check revision " + i); let cs = revisions[rev].changeset;
var cs = revisions[i].changeset;
atext = Changeset.applyToAText(cs, atext, apool); atext = Changeset.applyToAText(cs, atext, apool);
} catch(e) { } catch (e) {
console.error("[" + pad.id + "] Bad changeset at revision " + i + " - " + e.message); console.error("[" + pad.id + "] Bad changeset at revision " + i + " - " + e.message);
callback();
return;
} }
} }
callback();
});
}, callback);
});
}, callback);
} }
],
function (err) {
if (err) {
throw err;
} else {
console.log("finished"); console.log("finished");
process.exit(0); process.exit(0);
} }
} catch (err) {
console.trace(err);
process.exit(1);
}
}); });

View file

@ -7,85 +7,60 @@ if (process.argv.length != 3) {
process.exit(1); process.exit(1);
} }
//get the padID // get the padID
var padId = process.argv[2]; const padId = process.argv[2];
// initialize the variables // load and initialize NPM;
var db, settings, padManager; let npm = require('../src/node_modules/npm');
var npm = require('../src/node_modules/npm'); npm.load({}, async function() {
var async = require('../src/node_modules/async');
var Changeset = require('ep_etherpad-lite/static/js/Changeset'); try {
// initialize database
async.series([ let settings = require('../src/node/utils/Settings');
// load npm let db = require('../src/node/db/DB');
function(callback) { await db.init();
npm.load({}, function(er) {
callback(er);
});
},
// load modules // load modules
function(callback) { let Changeset = require('ep_etherpad-lite/static/js/Changeset');
settings = require('../src/node/utils/Settings'); let padManager = require('../src/node/db/PadManager');
db = require('../src/node/db/DB');
// initialize the database let exists = await padManager.doesPadExists(padId);
db.init(callback);
},
// get the pad
function (callback) {
padManager = require('../src/node/db/PadManager');
padManager.doesPadExists(padId, function(err, exists) {
if (!exists) { if (!exists) {
console.error("Pad does not exist"); console.error("Pad does not exist");
process.exit(1); process.exit(1);
} }
padManager.getPad(padId, function(err, _pad) { // get the pad
pad = _pad; let pad = await padManager.getPad(padId);
callback(err);
});
});
},
function (callback) {
// create an array with key revisions // create an array with key revisions
// key revisions always save the full pad atext // key revisions always save the full pad atext
var head = pad.getHeadRevisionNumber(); let head = pad.getHeadRevisionNumber();
var keyRevisions = []; let keyRevisions = [];
for (var i = 0; i < head; i += 100) { for (let rev = 0; rev < head; rev += 100) {
keyRevisions.push(i); keyRevisions.push(rev);
} }
// run through all key revisions // run through all key revisions
async.forEachSeries(keyRevisions, function(keyRev, callback) { for (let keyRev of keyRevisions) {
// create an array of revisions we need till the next keyRevision or the End // create an array of revisions we need till the next keyRevision or the End
var revisionsNeeded = []; let revisionsNeeded = [];
for(var i = keyRev; i <= keyRev + 100 && i <= head; i++) { for (let rev = keyRev; rev <= keyRev + 100 && rev <= head; rev++) {
revisionsNeeded.push(i); revisionsNeeded.push(rev);
} }
// this array will hold all revision changesets // this array will hold all revision changesets
var revisions = []; var revisions = [];
// run through all needed revisions and get them from the database // run through all needed revisions and get them from the database
async.forEach(revisionsNeeded, function(revNum, callback) { for (let revNum of revisionsNeeded) {
db.db.get("pad:" + padId + ":revs:" + revNum, function(err, revision) { let revision = await db.get("pad:" + padId + ":revs:" + revNum);
revisions[revNum] = revision; revisions[revNum] = revision;
callback(err);
});
},
function(err) {
if (err) {
callback(err);
return;
} }
// check if the pad has a pool // check if the pad has a pool
if (pad.pool === undefined) { if (pad.pool === undefined ) {
console.error("Attribute pool is missing"); console.error("Attribute pool is missing");
process.exit(1); process.exit(1);
} }
@ -93,35 +68,28 @@ async.series([
// check if there is an atext in the keyRevisions // check if there is an atext in the keyRevisions
if (revisions[keyRev] === undefined || revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) { if (revisions[keyRev] === undefined || revisions[keyRev].meta === undefined || revisions[keyRev].meta.atext === undefined) {
console.error("No atext in key revision " + keyRev); console.error("No atext in key revision " + keyRev);
callback(); continue;
return;
} }
var apool = pad.pool; let apool = pad.pool;
var atext = revisions[keyRev].meta.atext; let atext = revisions[keyRev].meta.atext;
for (var i = keyRev + 1; i <= keyRev + 100 && i <= head; i++) { for (let rev = keyRev + 1; rev <= keyRev + 100 && rev <= head; rev++) {
try { try {
// console.log("check revision " + i); // console.log("check revision " + rev);
var cs = revisions[i].changeset; let cs = revisions[rev].changeset;
atext = Changeset.applyToAText(cs, atext, apool); atext = Changeset.applyToAText(cs, atext, apool);
} catch(e) { } catch(e) {
console.error("Bad changeset at revision " + i + " - " + e.message); console.error("Bad changeset at revision " + rev + " - " + e.message);
callback(); continue;
return;
} }
} }
callback();
});
}, callback);
}
],
function (err) {
if(err) {
throw err;
} else {
console.log("finished"); console.log("finished");
process.exit(0); process.exit(0);
} }
} catch (e) {
console.trace(e);
process.exit(1);
}
}); });

View file

@ -9,55 +9,33 @@ if (process.argv.length != 3) {
} }
// get the padID // get the padID
var padId = process.argv[2]; let padId = process.argv[2];
var db, padManager, pad, settings; let npm = require('../src/node_modules/npm');
var neededDBValues = ["pad:"+padId];
var npm = require('../src/node_modules/npm'); npm.load({}, async function(er) {
var async = require('../src/node_modules/async');
async.series([
// load npm
function(callback) {
npm.load({}, function(er) {
if (er) { if (er) {
console.error("Could not load NPM: " + er) console.error("Could not load NPM: " + er)
process.exit(1); process.exit(1);
} else {
callback();
} }
});
},
// load modules try {
function(callback) { let settings = require('../src/node/utils/Settings');
settings = require('../src/node/utils/Settings'); let db = require('../src/node/db/DB');
db = require('../src/node/db/DB'); await db.init();
callback();
},
// initialize the database
function (callback) {
db.init(callback);
},
// delete the pad and its links
function (callback) {
padManager = require('../src/node/db/PadManager'); padManager = require('../src/node/db/PadManager');
await padManager.removePad(padId);
padManager.removePad(padId, function(err){
callback(err);
});
callback();
}
],
function (err) {
if(err) {
throw err;
} else {
console.log("Finished deleting padId: " + padId); console.log("Finished deleting padId: " + padId);
process.exit(); process.exit(0);
} catch (e) {
if (err.name === "apierror") {
console.error(e);
} else {
console.trace(e);
}
process.exit(1);
} }
}); });

View file

@ -10,88 +10,66 @@ if (process.argv.length != 3) {
} }
// get the padID // get the padID
var padId = process.argv[2]; let padId = process.argv[2];
var db, dirty, padManager, pad, settings; let npm = require('../src/node_modules/npm');
var neededDBValues = ["pad:"+padId];
var npm = require('../node_modules/ep_etherpad-lite/node_modules/npm'); npm.load({}, async function(er) {
var async = require('../node_modules/ep_etherpad-lite/node_modules/async');
async.series([
// load npm
function(callback) {
npm.load({}, function(er) {
if (er) { if (er) {
console.error("Could not load NPM: " + er) console.error("Could not load NPM: " + er)
process.exit(1); process.exit(1);
} else {
callback();
} }
})
},
// load modules try {
function(callback) { // initialize database
settings = require('../node_modules/ep_etherpad-lite/node/utils/Settings'); let settings = require('../src/node/utils/Settings');
db = require('../node_modules/ep_etherpad-lite/node/db/DB'); let db = require('../src/node/db/DB');
dirty = require('../node_modules/ep_etherpad-lite/node_modules/ueberDB/node_modules/dirty')(padId + ".db"); await db.init();
callback();
},
// initialize the database // load extra modules
function (callback) { let dirtyDB = require('../src/node_modules/dirty');
db.init(callback); let padManager = require('../src/node/db/PadManager');
}, let util = require('util');
// get the pad // initialize output database
function (callback) { let dirty = dirtyDB(padId + '.db');
padManager = require('../node_modules/ep_etherpad-lite/node/db/PadManager');
padManager.getPad(padId, function(err, _pad) { // Promise wrapped get and set function
pad = _pad; let wrapped = db.db.db.wrappedDB;
callback(err); let get = util.promisify(wrapped.get.bind(wrapped));
}); let set = util.promisify(dirty.set.bind(dirty));
},
// array in which required key values will be accumulated
let neededDBValues = ['pad:' + padId];
// get the actual pad object
let pad = await padManager.getPad(padId);
function (callback) {
// add all authors // add all authors
var authors = pad.getAllAuthors(); neededDBValues.push(...pad.getAllAuthors().map(author => 'globalAuthor:' + author));
for (var i = 0; i < authors.length; i++) {
neededDBValues.push('globalAuthor:' + authors[i]);
}
// add all revisions // add all revisions
var revHead = pad.head; for (let rev = 0; rev <= pad.head; ++rev) {
for (var i = 0; i <= revHead; i++) { neededDBValues.push('pad:' + padId + ':revs:' + rev);
neededDBValues.push('pad:' + padId + ':revs:' + i);
} }
// get all chat values // add all chat values
var chatHead = pad.chatHead; for (let chat = 0; chat <= pad.chatHead; ++chat) {
for (var i = 0; i <= chatHead; i++) { neededDBValues.push('pad:' + padId + ':chat:' + chat);
neededDBValues.push('pad:' + padId + ':chat:' + i);
} }
// get and set all values for (let dbkey of neededDBValues) {
async.forEach(neededDBValues, function(dbkey, callback) { let dbvalue = await get(dbkey);
db.db.db.wrappedDB.get(dbkey, function(err, dbvalue) { if (dbvalue && typeof dbvalue !== 'object') {
if (err) { callback(err); return} dbvalue = JSON.parse(dbvalue);
}
if (dbvalue && typeof dbvalue != 'object') { await set(dbkey, dbvalue);
dbvalue = JSON.parse(dbvalue); // if it's not json then parse it as json
} }
dirty.set(dbkey, dbvalue, callback); console.log('finished');
}); process.exit(0);
}, callback); } catch (er) {
} console.error(er);
], process.exit(1);
function (err) {
if (err) {
throw err;
} else {
console.log("finished");
process.exit();
} }
}); });