libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

not working and erally confused

Browse source
This commit is contained in:
John McLear 2013-11-27 00:23:11 +00:00
parent 1fa2b32854
commit 6fcc7c77f9
1 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/node/handler/ImportHandler.js
View file

@ -29,8 +29,8 @@ var ERR = require("async-stacktrace")
, formidable = require('formidable')
, os = require("os")
, 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
if(settings.abiword != null)
@ -52,7 +52,10 @@ exports.doImport = function(req, res, padId)
var srcFile, destFile
, pad
, text;
, text
, importHandledByPlugin;
var randNum = Math.floor(Math.random()*0xFFFFFFFF);
async.series([
//save the uploaded file to /tmp
@ -91,29 +94,45 @@ exports.doImport = function(req, res, padId)
else {
var oldSrcFile = srcFile;
srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
fs.rename(oldSrcFile, srcFile, callback);
}
},
//convert file to html
function(callback) {
var randNum = Math.floor(Math.random()*0xFFFFFFFF);
function(callback){
destFile = path.join(tmpDirectory, "eplite_import_" + randNum + ".htm");
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);
// Logic for allowing external Import Plugins
hooks.aCallAll("import", {srcFile: srcFile, destFile: destFile}, function(err, result){
if(ERR(err, callback)) return callback();
console.log(result);
if(result.length > 0){ // This feels hacky and wrong..
apiLogger.info("Plugin handling import");
importHandledByPlugin = true;
srcFile = "blah.html";
callback();
}else{
callback();
}
});
},
//convert file to html
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();
}
},
@ -173,6 +192,7 @@ exports.doImport = function(req, res, padId)
function(callback) {
var fileEnding = path.extname(srcFile).toLowerCase();
if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
console.log("trying", fileEnding, abiword, text)
try{
importHtml.setPadHTML(pad, text);
}catch(e){