mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

db/Pad.js: start use of promise DB methods

Browse source
This commit is contained in:
Ray Bellis 2019-01-30 10:25:46 +00:00
parent 7f19033cc0
commit 982d4f380a
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/node/db/Pad.js
View file

@ -6,7 +6,7 @@
var ERR = require("async-stacktrace"); var ERR = require("async-stacktrace");
var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool"); var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
var db = require("./DB").db; var db = require("./DB");
var async = require("async"); var async = require("async");
var settings = require('../utils/Settings'); var settings = require('../utils/Settings');
var authorManager = require("./AuthorManager"); var authorManager = require("./AuthorManager");
@ -128,25 +128,25 @@ Pad.prototype.saveToDatabase = function saveToDatabase() {
} }
} }
db.set("pad:" + this.id, dbObject); db.db.set("pad:" + this.id, dbObject);
} }
// get time of last edit (changeset application) // get time of last edit (changeset application)
Pad.prototype.getLastEdit = thenify(function getLastEdit(callback) { Pad.prototype.getLastEdit = function getLastEdit() {
var revNum = this.getHeadRevisionNumber(); var revNum = this.getHeadRevisionNumber();
db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "timestamp"], callback); return db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "timestamp"]);
}); }
Pad.prototype.getRevisionChangeset = thenify(function getRevisionChangeset(revNum, callback) { Pad.prototype.getRevisionChangeset = thenify(function getRevisionChangeset(revNum, callback) {
db.getSub("pad:" + this.id + ":revs:" + revNum, ["changeset"], callback); db.db.getSub("pad:" + this.id + ":revs:" + revNum, ["changeset"], callback);
}); });
Pad.prototype.getRevisionAuthor = thenify(function getRevisionAuthor(revNum, callback) { Pad.prototype.getRevisionAuthor = thenify(function getRevisionAuthor(revNum, callback) {
db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "author"], callback); db.db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "author"], callback);
}); });
Pad.prototype.getRevisionDate = thenify(function getRevisionDate(revNum, callback) { Pad.prototype.getRevisionDate = thenify(function getRevisionDate(revNum, callback) {
db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "timestamp"], callback); db.db.getSub("pad:" + this.id + ":revs:" + revNum, ["meta", "timestamp"], callback);
}); });
Pad.prototype.getAllAuthors = function getAllAuthors() { Pad.prototype.getAllAuthors = function getAllAuthors() {
@ -182,7 +182,7 @@ Pad.prototype.getInternalRevisionAText = thenify(function getInternalRevisionATe
async.parallel([ async.parallel([
// get the atext of the key revision // get the atext of the key revision
function (callback) { function (callback) {
db.getSub("pad:" + _this.id + ":revs:" + keyRev, ["meta", "atext"], function(err, _atext) { db.db.getSub("pad:" + _this.id + ":revs:" + keyRev, ["meta", "atext"], function(err, _atext) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
try { try {
atext = Changeset.cloneAText(_atext); atext = Changeset.cloneAText(_atext);
@ -232,7 +232,7 @@ Pad.prototype.getInternalRevisionAText = thenify(function getInternalRevisionATe
}); });
Pad.prototype.getRevision = thenify(function getRevisionChangeset(revNum, callback) { Pad.prototype.getRevision = thenify(function getRevisionChangeset(revNum, callback) {
db.get("pad:" + this.id + ":revs:" + revNum, callback); db.db.get("pad:" + this.id + ":revs:" + revNum, callback);
}); });
Pad.prototype.getAllAuthorColors = thenify(function getAllAuthorColors(callback) { Pad.prototype.getAllAuthorColors = thenify(function getAllAuthorColors(callback) {
@ -333,7 +333,7 @@ Pad.prototype.getChatMessage = thenify(function getChatMessage(entryNum, callbac
async.series([ async.series([
// get the chat entry // get the chat entry
function(callback) { function(callback) {
db.get("pad:" + _this.id + ":chat:" + entryNum, function(err, _entry) { db.db.get("pad:" + _this.id + ":chat:" + entryNum, function(err, _entry) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
entry = _entry; entry = _entry;
callback(); callback();
@ -410,7 +410,7 @@ Pad.prototype.init = thenify(function init(text, callback) {
} }
// try to load the pad // try to load the pad
db.get("pad:" + this.id, function(err, value) { db.db.get("pad:" + this.id, function(err, value) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
// if this pad exists, load it // if this pad exists, load it
@ -509,7 +509,7 @@ Pad.prototype.copy = thenify(function copy(destinationID, force, callback) {
// copy the 'pad' entry // copy the 'pad' entry
function(callback) { function(callback) {
db.get("pad:" + sourceID, function(err, pad) { db.db.get("pad:" + sourceID, function(err, pad) {
db.set("pad:" + destinationID, pad); db.set("pad:" + destinationID, pad);
}); });
@ -524,7 +524,7 @@ Pad.prototype.copy = thenify(function copy(destinationID, force, callback) {
var chatHead = _this.chatHead; var chatHead = _this.chatHead;
for (var i=0; i <= chatHead; i++) { for (var i=0; i <= chatHead; i++) {
db.get("pad:" + sourceID + ":chat:" + i, function (err, chat) { db.db.get("pad:" + sourceID + ":chat:" + i, function (err, chat) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
db.set("pad:" + destinationID + ":chat:" + i, chat); db.set("pad:" + destinationID + ":chat:" + i, chat);
}); });
@ -537,7 +537,7 @@ Pad.prototype.copy = thenify(function copy(destinationID, force, callback) {
function(callback) { function(callback) {
var revHead = _this.head; var revHead = _this.head;
for (var i=0; i <= revHead; i++) { for (var i=0; i <= revHead; i++) {
db.get("pad:" + sourceID + ":revs:" + i, function (err, rev) { db.db.get("pad:" + sourceID + ":revs:" + i, function (err, rev) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
db.set("pad:" + destinationID + ":revs:" + i, rev); db.set("pad:" + destinationID + ":revs:" + i, rev);
}); });
@ -606,7 +606,7 @@ Pad.prototype.remove = thenify(function remove(callback) {
// it is a group pad // it is a group pad
var groupID = padID.substring(0, padID.indexOf("$")); var groupID = padID.substring(0, padID.indexOf("$"));
db.get("group:" + groupID, function (err, group) { db.db.get("group:" + groupID, function (err, group) {
if (ERR(err, callback)) return; if (ERR(err, callback)) return;
// remove the pad entry // remove the pad entry