mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Some improvements - code cleanup

Browse source
This commit is contained in:
Stefan Müller 2024-08-16 21:53:43 +02:00
parent 38eb31a140
commit 826f57c28d
2 changed files with 6 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/handler/PadMessageHandler.ts
View file

@ -1142,7 +1142,7 @@ const getChangesetInfo = async (pad: PadType, startNum: number, endNum:number, g
getPadLines(pad, startNum - 1), getPadLines(pad, startNum - 1),
// Get all needed composite Changesets. // Get all needed composite Changesets.
...compositesChangesetNeeded.map(async (item) => { ...compositesChangesetNeeded.map(async (item) => {
const changeset = await composePadChangesets(pad, item.start, item.end); const changeset = await exports.composePadChangesets(pad, item.start, item.end);
composedChangesets[`${item.start}/${item.end}`] = changeset; composedChangesets[`${item.start}/${item.end}`] = changeset;
}), }),
// Get all needed revision Dates. // Get all needed revision Dates.
@ -1208,7 +1208,7 @@ const getPadLines = async (pad: PadType, revNum: number) => {
* Tries to rebuild the composePadChangeset function of the original Etherpad * Tries to rebuild the composePadChangeset function of the original Etherpad
* https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L241 * https://github.com/ether/pad/blob/master/etherpad/src/etherpad/control/pad/pad_changeset_control.js#L241
*/ */
const composePadChangesets = async (pad: PadType, startNum: number, endNum: number) => { exports.composePadChangesets = async (pad: PadType, startNum: number, endNum: number) => {
// fetch all changesets we need // fetch all changesets we need
const headNum = pad.getHeadRevisionNumber(); const headNum = pad.getHeadRevisionNumber();
endNum = Math.min(endNum, headNum + 1); endNum = Math.min(endNum, headNum + 1);

47
src/node/utils/Cleanup.ts
View file

@ -1,8 +1,6 @@
'use strict' 'use strict'
import {AChangeSet, PadType} from "../types/PadType"; import {AChangeSet} from "../types/PadType";
import {MapArrayType} from "../types/MapType";
import {ChangeSet} from "../types/ChangeSet";
import {Revision} from "../types/Revision"; import {Revision} from "../types/Revision";
const promises = require('./promises'); const promises = require('./promises');
@ -13,43 +11,6 @@ const db = require('ep_etherpad-lite/node/db/DB');
const Changeset = require('ep_etherpad-lite/static/js/Changeset'); const Changeset = require('ep_etherpad-lite/static/js/Changeset');
const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler'); const padMessageHandler = require('ep_etherpad-lite/node/handler/PadMessageHandler');
const composePadChangesets = async (pad: PadType, startNum: number, endNum: number) => {
// fetch all changesets we need
const headNum = pad.getHeadRevisionNumber();
endNum = Math.min(endNum, headNum + 1);
startNum = Math.max(startNum, 0);
// create an array for all changesets, we will
// replace the values with the changeset later
const changesetsNeeded = [];
for (let r = startNum; r < endNum; r++) {
changesetsNeeded.push(r);
}
// get all changesets
const changesets: MapArrayType<ChangeSet> = {};
await Promise.all(changesetsNeeded.map(
(revNum) => pad.getRevisionChangeset(revNum)
.then((changeset) => changesets[revNum] = changeset)));
// compose Changesets
let r;
try {
let changeset = changesets[startNum];
const pool = pad.apool();
for (r = startNum + 1; r < endNum; r++) {
const cs = changesets[r];
changeset = Changeset.compose(changeset, cs, pool);
}
return changeset;
} catch (e) {
// r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3
throw e;
}
};
exports.deleteAllRevisions = async (padID: string): Promise<void> => { exports.deleteAllRevisions = async (padID: string): Promise<void> => {
const randomPadId = padID + 'aertdfdf' + Math.random().toString(10) const randomPadId = padID + 'aertdfdf' + Math.random().toString(10)
@ -61,7 +22,7 @@ exports.deleteAllRevisions = async (padID: string): Promise<void> => {
await pad.remove(); await pad.remove();
} }
const createRevision = async (aChangeset: AChangeSet, timestamp: number, isKeyRev: boolean, authorId = '', atext: any = null, pool: any = null) => { const createRevision = async (aChangeset: AChangeSet, timestamp: number, isKeyRev: boolean, authorId: string, atext: any, pool: any) => {
if (authorId !== '') pool.putAttrib(['author', authorId]); if (authorId !== '') pool.putAttrib(['author', authorId]);
@ -81,7 +42,7 @@ const createRevision = async (aChangeset: AChangeSet, timestamp: number, isKeyRe
exports.deleteRevisions = async (padId: string, keepRevisions: number): Promise<void> => { exports.deleteRevisions = async (padId: string, keepRevisions: number): Promise<void> => {
let pad = await padManager.getPad(padId); let pad = await padManager.getPad(padId);
pad.check() await pad.check()
console.log('Initial pad is valid') console.log('Initial pad is valid')
@ -89,7 +50,7 @@ exports.deleteRevisions = async (padId: string, keepRevisions: number): Promise<
const cleanupUntilRevision = pad.head - keepRevisions const cleanupUntilRevision = pad.head - keepRevisions
console.log('Composing changesets: ', cleanupUntilRevision) console.log('Composing changesets: ', cleanupUntilRevision)
const changeset = await composePadChangesets(pad, 0, cleanupUntilRevision + 1) const changeset = await padMessageHandler.composePadChangesets(pad, 0, cleanupUntilRevision + 1)
const revisions: Revision[] = []; const revisions: Revision[] = [];