summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/locales/en.json1
-rw-r--r--src/node/handler/ExportHandler.js14
-rw-r--r--src/node/handler/ImportHandler.js111
-rw-r--r--src/node/hooks/express/importexport.js2
-rw-r--r--src/static/css/pad.css3
-rw-r--r--src/static/js/pad_impexp.js1
-rw-r--r--src/templates/pad.html1
7 files changed, 91 insertions, 42 deletions
diff --git a/src/locales/en.json b/src/locales/en.json
index 9a5fe45f..5e074e38 100644
--- a/src/locales/en.json
+++ b/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",
diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js
index f12d66c2..23d1cb10 100644
--- a/src/node/handler/ExportHandler.js
+++ b/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 == "txt")
+ if(type == "etherpad"){
+ console.log("Exporting Etherpad");
+ exportEtherpad.getPadRaw(padId, function(err, pad){
+ if(!err){
+ res.send(pad);
+ // return;
+ }
+ });
+ }
+ else if(type == "txt")
{
var txt;
var randNum;
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 55915d76..7ea10988 100644
--- a/src/node/handler/ImportHandler.js
+++ b/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(ERR(err, callback)) return;
- text = _text;
- // Title needs to be stripped out else it appends it to the pad..
- 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
- if(os.type().indexOf("Windows") > -1){
- setTimeout(function() {callback();}, 100);
- } else {
- callback();
- }
- });
+ if(!directDatabaseAccess){
+ fs.readFile(destFile, "utf8", function(err, _text){
+ if(ERR(err, callback)) return;
+ text = _text;
+ // Title needs to be stripped out else it appends it to the pad..
+ 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
+ if(os.type().indexOf("Windows") > -1){
+ setTimeout(function() {callback();}, 100);
+ } else {
+ callback();
+ }
+ });
+ }else{
+ callback();
+ }
},
//change text of the pad and broadcast the changeset
function(callback) {
- var fileEnding = path.extname(srcFile).toLowerCase();
- if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
- try{
- importHtml.setPadHTML(pad, text);
- }catch(e){
- apiLogger.warn("Error importing, possibly caused by malformed HTML");
+ if(!directDatabaseAccess){
+ var fileEnding = path.extname(srcFile).toLowerCase();
+ if (abiword || fileEnding == ".htm" || fileEnding == ".html") {
+ try{
+ importHtml.setPadHTML(pad, text);
+ }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
- var fileExists = fs.exists || path.exists;
- async.parallel([
- function(callback){
- fileExists (srcFile, function(exist) { (exist)? fs.unlink(srcFile, callback): callback(); });
- },
- function(callback){
- fileExists (destFile, function(exist) { (exist)? fs.unlink(destFile, callback): callback(); });
- }
- ], callback);
+ if(!directDatabaseAccess){
+ //for node < 0.7 compatible
+ var fileExists = fs.exists || path.exists;
+ async.parallel([
+ function(callback){
+ fileExists (srcFile, function(exist) { (exist)? fs.unlink(srcFile, callback): callback(); });
+ },
+ function(callback){
+ fileExists (destFile, function(exist) { (exist)? fs.unlink(destFile, callback): callback(); });
+ }
+ ], callback);
+ }else{
+ callback();
+ }
}
], function(err) {
diff --git a/src/node/hooks/express/importexport.js b/src/node/hooks/express/importexport.js
index 378e8865..f3f05163 100644
--- a/src/node/hooks/express/importexport.js
+++ b/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();
diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index c1035e8d..0ff613fc 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -689,6 +689,9 @@ table#otheruserstable {
#exportpdfa:before {
content: "\e803";
}
+#exportetherpada:before {
+ content: "\e806";
+}
#exportopena:before {
content: "\e805";
}
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 20cae2a0..2548b8bb 100644
--- a/src/static/js/pad_impexp.js
+++ b/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
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 2dd66aa9..fa28b542 100644
--- a/src/templates/pad.html
+++ b/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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:58:44 +0000