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

Merge pull request #2030 from ether/import_hook 

Working import hooks
pull/1964/merge
John McLear 2013-12-09 10:22:40 -08:00
parent 505dc70df5 3180b96213
commit 438f3fc717
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/node/handler/ImportHandler.js
View File

@ -29,8 +29,8 @@ var ERR = require("async-stacktrace")
, formidable = require('formidable') , formidable = require('formidable')
, os = require("os") , os = require("os")
, importHtml = require("../utils/ImportHtml") , importHtml = require("../utils/ImportHtml")
, log4js = require('log4js'); , log4js = require("log4js")
, hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
//load abiword only if its enabled //load abiword only if its enabled
if(settings.abiword != null) if(settings.abiword != null)
@ -52,7 +52,10 @@ exports.doImport = function(req, res, padId)
var srcFile, destFile var srcFile, destFile
, pad , pad
, text; , text
, importHandledByPlugin;
var randNum = Math.floor(Math.random()*0xFFFFFFFF);
async.series([ async.series([
//save the uploaded file to /tmp //save the uploaded file to /tmp
@ -91,29 +94,42 @@ exports.doImport = function(req, res, padId)
else { else {
var oldSrcFile = srcFile; var oldSrcFile = srcFile;
srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt"); srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
fs.rename(oldSrcFile, srcFile, callback); fs.rename(oldSrcFile, srcFile, callback);
} }
}, },
function(callback){
//convert file to html
function(callback) {
var randNum = Math.floor(Math.random()*0xFFFFFFFF);
destFile = path.join(tmpDirectory, "eplite_import_" + randNum + ".htm"); destFile = path.join(tmpDirectory, "eplite_import_" + randNum + ".htm");
if (abiword) { // Logic for allowing external Import Plugins
abiword.convertFile(srcFile, destFile, "htm", function(err) { hooks.aCallAll("import", {srcFile: srcFile, destFile: destFile}, function(err, result){
//catch convert errors if(ERR(err, callback)) return callback();
if(err) { if(result.length > 0){ // This feels hacky and wrong..
console.warn("Converting Error:", err); importHandledByPlugin = true;
return callback("convertFailed"); callback();
} else { }else{
callback(); callback();
} }
}); });
} else { },
// if no abiword only rename //convert file to html
fs.rename(srcFile, destFile, callback); function(callback) {
if(!importHandledByPlugin){
if (abiword) {
abiword.convertFile(srcFile, destFile, "htm", function(err) {
//catch convert errors
if(err) {
console.warn("Converting Error:", err);
return callback("convertFailed");
} else {
callback();
}
});
} else {
// if no abiword only rename
fs.rename(srcFile, destFile, callback);
}
}else{
callback();
} }
}, },