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

import/export: conversion to Promises/async

Browse source 
NB1: needs additional review and testing - no abiword available on my test bed
NB2: in ImportHandler.js, directly delete the file, and handle the eventual
     error later: checking before for existence is prone to race conditions,
     and does not handle any errors anyway.
This commit is contained in:
Ray Bellis 2019-01-31 08:55:36 +00:00
parent 5192a0c498
commit 62345ac8f7
8 changed files with 379 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/node/utils/ImportEtherpad.js
View file

@ -15,43 +15,44 @@
*/
var log4js = require('log4js');
var async = require("async");
var db = require("../db/DB").db;
const thenify = require("thenify").withCallback;
const db = require("../db/DB");
exports.setPadRaw = thenify(function(padId, records, callback)
exports.setPadRaw = function(padId, records)
{
records = JSON.parse(records);
async.eachSeries(Object.keys(records), function(key, cb) {
var value = records[key];
Object.keys(records).forEach(async function(key) {
let value = records[key];
if (!value) {
return setImmediate(cb);
return;
}
let newKey;
if (value.padIDs) {
// Author data - rewrite author pad ids
value.padIDs[padId] = 1;
var newKey = key;
newKey = key;
// Does this author already exist?
db.get(key, function(err, author) {
if (author) {
// Yes, add the padID to the author
if (Object.prototype.toString.call(author) === '[object Array]') {
author.padIDs.push(padId);
}
value = author;
} else {
// No, create a new array with the author info in
value.padIDs = [padId];
let author = await db.get(key);
if (author) {
// Yes, add the padID to the author
if (Object.prototype.toString.call(author) === '[object Array]') {
author.padIDs.push(padId);
}
});
value = author;
} else {
// No, create a new array with the author info in
value.padIDs = [ padId ];
}
} else {
// Not author data, probably pad data
// we can split it to look to see if it's pad data
var oldPadId = key.split(":");
let oldPadId = key.split(":");
// we know it's pad data
if (oldPadId[0] === "pad") {
@ -59,16 +60,11 @@ exports.setPadRaw = thenify(function(padId, records, callback)
oldPadId[1] = padId;
// and create the value
var newKey = oldPadId.join(":"); // create the new key
newKey = oldPadId.join(":"); // create the new key
}
}
// Write the value to the server
db.set(newKey, value);
setImmediate(cb);
},
function() {
callback(null, true);
await db.set(newKey, value);
});
});
}