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

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

10
src/node/utils/ImportHtml.js
View file

@ -18,9 +18,8 @@ var log4js = require('log4js');
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
var cheerio = require("cheerio");
const thenify = require("thenify").withCallback;
function setPadHTML(pad, html, callback)
exports.setPadHTML = function(pad, html)
{
var apiLogger = log4js.getLogger("ImportHtml");
@ -44,7 +43,7 @@ function setPadHTML(pad, html, callback)
apiLogger.warn("HTML was not properly formed", e);
// don't process the HTML because it was bad
return callback(e);
throw e;
}
var result = cc.finish();
@ -52,7 +51,7 @@ function setPadHTML(pad, html, callback)
apiLogger.debug('Lines:');
var i;
for (i = 0; i < result.lines.length; i += 1) {
for (i = 0; i < result.lines.length; i++) {
apiLogger.debug('Line ' + (i + 1) + ' text: ' + result.lines[i]);
apiLogger.debug('Line ' + (i + 1) + ' attributes: ' + result.lineAttribs[i]);
}
@ -92,7 +91,4 @@ function setPadHTML(pad, html, callback)
apiLogger.debug('The changeset: ' + theChangeset);
pad.setText("\n");
pad.appendRevision(theChangeset);
callback(null);
}
exports.setPadHTML = thenify(setPadHTML);