mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-28 03:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

LibreOffice: use filter XHTML Writer File during import

Browse source 
ImportHandler: remove self-closing title element
This commit is contained in:
webzwo0i 2020-09-03 08:30:30 +02:00
parent d075daf166
commit 2d01f4cd8b
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -211,9 +211,15 @@ async function doImport(req, res, padId)
* Moreover, when using LibreOffice to convert the file, some classes are * Moreover, when using LibreOffice to convert the file, some classes are
* added to the <title> tag. This is a quick & dirty way of matching the * added to the <title> tag. This is a quick & dirty way of matching the
* title and comment it out independently on the classes that are set on it. * title and comment it out independently on the classes that are set on it.
*
* @todo what happens if <title is used somewhere in the pad? need proper XML parser
*/ */
text = text.replace("<title", "<!-- <title"); if (text.match(/<\/title>/)){
text = text.replace("</title>","</title>-->"); text = text.replace("<title", "<!-- <title");
text = text.replace("</title>","</title>-->");
} else {
text = text.replace(/<title[^>]*\/>/,'');
}
// node on windows has a delay on releasing of the file lock. // node on windows has a delay on releasing of the file lock.
// We add a 100ms delay to work around this // We add a 100ms delay to work around this

3
src/node/utils/LibreOffice.js
View file

@ -85,7 +85,8 @@ function doConvertTask(task, callback) {
'--nologo', '--nologo',
'--nolockcheck', '--nolockcheck',
'--writer', '--writer',
'--convert-to', task.type, '--convert-to',
`${task.type}:XHTML Writer File:UTF8`,
task.srcFile, task.srcFile,
'--outdir', tmpDir '--outdir', tmpDir
]); ]);

2
tests/backend/specs/api/docImport.js
View file

@ -108,7 +108,7 @@ describe('getText', function(){
setTimeout(function(){ setTimeout(function(){
api.get(endPoint('getText')+"&padID="+testPadId) api.get(endPoint('getText')+"&padID="+testPadId)
.expect(function(res){ .expect(function(res){
if(res.body.data.text.indexOf("RichardC. Hay" !== -1)){ if(res.body.data.text.indexOf("RichardC. Hay") !== -1) {
console.warn(res.body.data.text); console.warn(res.body.data.text);
throw new Error("Error with doc keeping spaces", res.body.data.text); throw new Error("Error with doc keeping spaces", res.body.data.text);
} }