semi working requires browser refresh

src/locales/en.json

@@ -44,6 +44,7 @@
   "pad.importExport.import": "Upload any text file or document",
   "pad.importExport.importSuccessful": "Successful!",
   "pad.importExport.export": "Export current pad as:",
+  "pad.importExport.exportetherpad": "Etherpad",
   "pad.importExport.exporthtml": "HTML",
   "pad.importExport.exportplain": "Plain text",
   "pad.importExport.exportword": "Microsoft Word",

src/node/handler/ExportHandler.js

@@ -21,6 +21,7 @@
 var ERR = require("async-stacktrace");
 var exporthtml = require("../utils/ExportHtml");
 var exporttxt = require("../utils/ExportTxt");
+var exportEtherpad = require("../utils/ExportEtherpad");
 var async = require("async");
 var fs = require("fs");
 var settings = require('../utils/Settings');
@@ -52,14 +53,21 @@ exports.doExport = function(req, res, padId, type)
       // if fileName is set then set it to the padId, note that fileName is returned as an array.
       if(hookFileName.length) fileName = hookFileName;
 
-
       //tell the browser that this is a downloadable file
       res.attachment(fileName + "." + type);
     
       //if this is a plain text export, we can do this directly
       // We have to over engineer this because tabs are stored as attributes and not plain text
-    
+      if(type == "etherpad"){
-      if(type == "txt")
+        console.log("Exporting Etherpad");
+        exportEtherpad.getPadRaw(padId, function(err, pad){
+          if(!err){
+            res.send(pad);
+            // return;
+          }
+        });
+      }
+      else if(type == "txt")
       {
         var txt;
         var randNum;

src/node/handler/ImportHandler.js

@@ -29,6 +29,7 @@ var ERR = require("async-stacktrace")
   , formidable = require('formidable')
   , os = require("os")
   , importHtml = require("../utils/ImportHtml")
+  , importEtherpad = require("../utils/ImportEtherpad")
   , log4js = require("log4js")
   , hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js");
 
@@ -53,7 +54,8 @@ exports.doImport = function(req, res, padId)
   var srcFile, destFile
     , pad
     , text
-    , importHandledByPlugin;
+    , importHandledByPlugin
+    , directDatabaseAccess;
 
   var randNum = Math.floor(Math.random()*0xFFFFFFFF);
   
@@ -83,7 +85,7 @@ exports.doImport = function(req, res, padId)
     //this allows us to accept source code files like .c or .java
     function(callback) {
       var fileEnding = path.extname(srcFile).toLowerCase()
-        , knownFileEndings = [".txt", ".doc", ".docx", ".pdf", ".odt", ".html", ".htm"]
+        , knownFileEndings = [".txt", ".doc", ".docx", ".pdf", ".odt", ".html", ".htm", ".etherpad"]
         , fileEndingKnown = (knownFileEndings.indexOf(fileEnding) > -1);
       
       //if the file ending is known, continue as normal
@@ -116,9 +118,22 @@ exports.doImport = function(req, res, padId)
         }
       });
     },
+    function(callback) {
+      var fileEnding = path.extname(srcFile).toLowerCase()
+      var fileIsEtherpad = (fileEnding === ".etherpad");
+      if(fileIsEtherpad){
+        fs.readFile(srcFile, "utf8", function(err, _text){
+          directDatabaseAccess = true;
+          importEtherpad.setPadRaw(padId, _text, function(err){
+            console.log("returning");
+            return callback(null);
+          });
+        });
+      }
+    },
     //convert file to html
     function(callback) {
-      if(!importHandledByPlugin){
+      if(!importHandledByPlugin || !directDatabaseAccess){
         var fileEnding = path.extname(srcFile).toLowerCase();
         var fileIsHTML = (fileEnding === ".html" || fileEnding === ".htm");
         if (abiword && !fileIsHTML) {
@@ -141,7 +156,7 @@ exports.doImport = function(req, res, padId)
     },
     
     function(callback) {
-      if (!abiword) {
+      if (!abiword || !directDatabaseAccess) {
         // Read the file with no encoding for raw buffer access.
         fs.readFile(destFile, function(err, buf) {
           if (err) throw err;
@@ -175,50 +190,70 @@ exports.doImport = function(req, res, padId)
     
     //read the text
     function(callback) {
-      fs.readFile(destFile, "utf8", function(err, _text){
+      if(!directDatabaseAccess){
-        if(ERR(err, callback)) return;
+        fs.readFile(destFile, "utf8", function(err, _text){
-        text = _text;
+          if(ERR(err, callback)) return;
-        // Title needs to be stripped out else it appends it to the pad..
+          text = _text;
-        text = text.replace("<title>", "<!-- <title>");
+          // Title needs to be stripped out else it appends it to the pad..
-        text = text.replace("</title>","</title>-->");
+          text = text.replace("<title>", "<!-- <title>");
-
+          text = text.replace("</title>","</title>-->");
-        //node on windows has a delay on releasing of the file lock.  
+  
-        //We add a 100ms delay to work around this
+          //node on windows has a delay on releasing of the file lock.  
-        if(os.type().indexOf("Windows") > -1){
+          //We add a 100ms delay to work around this
-           setTimeout(function() {callback();}, 100);
+          if(os.type().indexOf("Windows") > -1){
-        } else {
+             setTimeout(function() {callback();}, 100);
-          callback();
+          } else {
-        }
+            callback();
-      });
+          }
+        });
+      }else{
+        callback();
+      }
     },
     
     //change text of the pad and broadcast the changeset
     function(callback) {
-      var fileEnding = path.extname(srcFile).toLowerCase();
+      if(!directDatabaseAccess){
-      if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
+        var fileEnding = path.extname(srcFile).toLowerCase();
-        try{
+        if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
-          importHtml.setPadHTML(pad, text);
+          try{
-        }catch(e){
+            importHtml.setPadHTML(pad, text);
-          apiLogger.warn("Error importing, possibly caused by malformed HTML");
+          }catch(e){
+            apiLogger.warn("Error importing, possibly caused by malformed HTML");
+          }
+        } else {
+          pad.setText(text);
         }
-      } else {
-        pad.setText(text);
       }
-      padMessageHandler.updatePadClients(pad, callback);
+
+      // Load the Pad into memory then brodcast updates to all clients
+      padManager.unloadPad(padId);
+      padManager.getPad(padId, function(err, _pad){
+        var pad = _pad;
+        padManager.unloadPad(padId);
+        padMessageHandler.updatePadClients(pad, function(){
+          callback();
+        });
+      });
+
     },
     
     //clean up temporary files
     function(callback) {
-      //for node < 0.7 compatible
+      if(!directDatabaseAccess){
-      var fileExists = fs.exists || path.exists;
+        //for node < 0.7 compatible
-      async.parallel([
+        var fileExists = fs.exists || path.exists;
-        function(callback){
+        async.parallel([
-          fileExists (srcFile, function(exist) { (exist)? fs.unlink(srcFile, callback): callback(); });
+          function(callback){
-        },
+            fileExists (srcFile, function(exist) { (exist)? fs.unlink(srcFile, callback): callback(); });
-        function(callback){
+          },
-          fileExists (destFile, function(exist) { (exist)? fs.unlink(destFile, callback): callback(); });
+          function(callback){
-        }
+            fileExists (destFile, function(exist) { (exist)? fs.unlink(destFile, callback): callback(); });
-      ], callback);
+          }
+        ], callback);
+      }else{
+        callback();
+      }
     }
   ], function(err) {
 

src/node/hooks/express/importexport.js

@@ -5,7 +5,7 @@ var importHandler = require('../../handler/ImportHandler');
 
 exports.expressCreateServer = function (hook_name, args, cb) {
   args.app.get('/p/:pad/:rev?/export/:type', function(req, res, next) {
-    var types = ["pdf", "doc", "txt", "html", "odt"];
+    var types = ["pdf", "doc", "txt", "html", "odt", "etherpad"];
     //send a 404 if we don't support this filetype
     if (types.indexOf(req.params.type) == -1) {
       next();

src/static/css/pad.css

@@ -689,6 +689,9 @@ table#otheruserstable {
 #exportpdfa:before {
   content: "\e803";
 }
+#exportetherpada:before {
+  content: "\e806";
+}
 #exportopena:before {
   content: "\e805";
 }

src/static/js/pad_impexp.js

@@ -198,6 +198,7 @@ var padimpexp = (function()
 
       // build the export links
       $("#exporthtmla").attr("href", pad_root_path + "/export/html");
+      $("#exportetherpada").attr("href", pad_root_path + "/export/etherpad");
       $("#exportplaina").attr("href", pad_root_path + "/export/txt");
 
       // activate action to import in the form

src/templates/pad.html

@@ -203,6 +203,7 @@
             <div class="column" id="exportColumn">
                 <h2 data-l10n-id="pad.importExport.export"></h2>
                 <% e.begin_block("exportColumn"); %>
+                <a id="exportetherpada" target="_blank" class="exportlink"><div class="exporttype" id="exportetherpad" data-l10n-id="pad.importExport.exportetherpad"></div></a>
                 <a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml" data-l10n-id="pad.importExport.exporthtml"></div></a>
                 <a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain" data-l10n-id="pad.importExport.exportplain"></div></a>
                 <a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword" data-l10n-id="pad.importExport.exportword"></div></a>