public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pad: Simplify `getInternalRevisionAText`

pull/5512/head
Richard Hansen 2021-12-01 16:39:01 -05:00
parent ff494563d9
commit 7ee2141fe6
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/node/db/Pad.js
View File

@ -7,6 +7,7 @@ const AttributeMap = require('../../static/js/AttributeMap');
const Changeset = require('../../static/js/Changeset'); const Changeset = require('../../static/js/Changeset');
const ChatMessage = require('../../static/js/ChatMessage'); const ChatMessage = require('../../static/js/ChatMessage');
const AttributePool = require('../../static/js/AttributePool'); const AttributePool = require('../../static/js/AttributePool');
const Stream = require('../utils/Stream');
const assert = require('assert').strict; const assert = require('assert').strict;
const db = require('./DB'); const db = require('./DB');
const settings = require('../utils/Settings'); const settings = require('../utils/Settings');
@ -163,36 +164,14 @@ class Pad {
async getInternalRevisionAText(targetRev) { async getInternalRevisionAText(targetRev) {
const keyRev = this.getKeyRevisionNumber(targetRev); const keyRev = this.getKeyRevisionNumber(targetRev);
const [keyAText, changesets] = await Promise.all([
// find out which changesets are needed this.db.getSub(`pad:${this.id}:revs:${keyRev}`, ['meta', 'atext']),
const neededChangesets = []; Promise.all(
for (let curRev = keyRev; curRev < targetRev;) { Stream.range(keyRev + 1, targetRev + 1).map(this.getRevisionChangeset.bind(this))),
neededChangesets.push(++curRev); ]);
}
// get all needed data out of the database
// start to get the atext of the key revision
const atextp = this.db.getSub(`pad:${this.id}:revs:${keyRev}`, ['meta', 'atext']);
// get all needed changesets
const changesets = [];
await Promise.all(
neededChangesets.map((item) => this.getRevisionChangeset(item).then((changeset) => {
changesets[item] = changeset;
})));
// we should have the atext by now
let atext = await atextp;
atext = Changeset.cloneAText(atext);
// apply all changesets to the key changeset
const apool = this.apool(); const apool = this.apool();
for (let curRev = keyRev; curRev < targetRev;) { let atext = keyAText;
const cs = changesets[++curRev]; for (const cs of changesets) atext = Changeset.applyToAText(cs, atext, apool);
atext = Changeset.applyToAText(cs, atext, apool);
}
return atext; return atext;
} }