File etherpad-lite-1.8.4-abiword_missing_AbiCommand.... of Package etherpad-lite

Overview Repositories Revisions Requests Users Attributes Meta

File etherpad-lite-1.8.4-abiword_missing_AbiCommand.patch of Package etherpad-lite (Revision 1a3b640678020da76be2fb988b238330)

Currently displaying revision 1a3b640678020da76be2fb988b238330 , Show latest

Index: etherpad-lite-1.8.5/src/node/utils/Abiword.js
===================================================================
--- etherpad-lite-1.8.5.orig/src/node/utils/Abiword.js
+++ etherpad-lite-1.8.5/src/node/utils/Abiword.js
@@ -26,8 +26,8 @@ var os = require('os');
 var doConvertTask;
 
 //on windows we have to spawn a process for each convertion, cause the plugin abicommand doesn't exist on this platform
-if(os.type().indexOf("Windows") > -1)
-{
+//if(os.type().indexOf("Windows") > -1)
+//{
   var stdoutBuffer = "";
 
   doConvertTask = function(task, callback)
@@ -68,81 +68,81 @@ if(os.type().indexOf("Windows") > -1)
   {
     doConvertTask({"srcFile": srcFile, "destFile": destFile, "type": type}, callback);
   };
-}
+//}
 //on unix operating systems, we can start abiword with abicommand and communicate with it via stdin/stdout
 //thats much faster, about factor 10
-else
-{
-  //spawn the abiword process
-  var abiword;
-  var stdoutCallback = null;
-  var spawnAbiword = function (){
-    abiword = spawn(settings.abiword, ["--plugin", "AbiCommand"]);
-    var stdoutBuffer = "";
-    var firstPrompt = true;
-
-    //append error messages to the buffer
-    abiword.stderr.on('data', function (data)
-    {
-      stdoutBuffer += data.toString();
-    });
-
-    //abiword died, let's restart abiword and return an error with the callback
-    abiword.on('exit', function (code)
-    {
-      spawnAbiword();
-      stdoutCallback(`Abiword died with exit code ${code}`);
-    });
-
-    //delegate the processing of stdout to a other function
-    abiword.stdout.on('data',function (data)
-    {
-      //add data to buffer
-      stdoutBuffer+=data.toString();
-
-      //we're searching for the prompt, cause this means everything we need is in the buffer
-      if(stdoutBuffer.search("AbiWord:>") != -1)
-      {
-        //filter the feedback message
-        var err = stdoutBuffer.search("OK") != -1 ? null : stdoutBuffer;
-
-        //reset the buffer
-        stdoutBuffer = "";
-
-        //call the callback with the error message
-        //skip the first prompt
-        if(stdoutCallback != null && !firstPrompt)
-        {
-          stdoutCallback(err);
-          stdoutCallback = null;
-        }
-
-        firstPrompt = false;
-      }
-    });
-  };
-  spawnAbiword();
-
-  doConvertTask = function(task, callback)
-  {
-    abiword.stdin.write("convert " + task.srcFile + " " + task.destFile + " " + task.type + "\n");
-    //create a callback that calls the task callback and the caller callback
-    stdoutCallback = function (err)
-    {
-      callback();
-      console.log("queue continue");
-      try{
-        task.callback(err);
-      }catch(e){
-        console.error("Abiword File failed to convert", e);
-      }
-    };
-  };
-
-  //Queue with the converts we have to do
-  var queue = async.queue(doConvertTask, 1);
-  exports.convertFile = function(srcFile, destFile, type, callback)
-  {
-    queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback});
-  };
-}
+//else
+//{
+//  //spawn the abiword process
+//  var abiword;
+//  var stdoutCallback = null;
+//  var spawnAbiword = function (){
+//    abiword = spawn(settings.abiword, ["--plugin", "AbiCommand"]);
+//    var stdoutBuffer = "";
+//    var firstPrompt = true;
+//
+//    //append error messages to the buffer
+//    abiword.stderr.on('data', function (data)
+//    {
+//      stdoutBuffer += data.toString();
+//    });
+//
+//    //abiword died, let's restart abiword and return an error with the callback
+//    abiword.on('exit', function (code)
+//    {
+//      spawnAbiword();
+//      stdoutCallback(`Abiword died with exit code ${code}`);
+//    });
+//
+//    //delegate the processing of stdout to a other function
+//    abiword.stdout.on('data',function (data)
+//    {
+//      //add data to buffer
+//      stdoutBuffer+=data.toString();
+//
+//      //we're searching for the prompt, cause this means everything we need is in the buffer
+//      if(stdoutBuffer.search("AbiWord:>") != -1)
+//      {
+//        //filter the feedback message
+//        var err = stdoutBuffer.search("OK") != -1 ? null : stdoutBuffer;
+//
+//        //reset the buffer
+//        stdoutBuffer = "";
+//
+//        //call the callback with the error message
+//        //skip the first prompt
+//        if(stdoutCallback != null && !firstPrompt)
+//        {
+//          stdoutCallback(err);
+//          stdoutCallback = null;
+//        }
+//
+//        firstPrompt = false;
+//      }
+//    });
+//  };
+//  spawnAbiword();
+//
+//  doConvertTask = function(task, callback)
+//  {
+//    abiword.stdin.write("convert " + task.srcFile + " " + task.destFile + " " + task.type + "\n");
+//    //create a callback that calls the task callback and the caller callback
+//    stdoutCallback = function (err)
+//    {
+//      callback();
+//      console.log("queue continue");
+//      try{
+//        task.callback(err);
+//      }catch(e){
+//        console.error("Abiword File failed to convert", e);
+//      }
+//    };
+//  };
+//
+//  //Queue with the converts we have to do
+//  var queue = async.queue(doConvertTask, 1);
+//  exports.convertFile = function(srcFile, destFile, type, callback)
+//  {
+//    queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback});
+//  };
+//}

Places

File etherpad-lite-1.8.4-abiword_missing_AbiCommand.patch of Package etherpad-lite (Revision 1a3b640678020da76be2fb988b238330)

Places