Fix .doc export with LibreOffice (soffice) #3338
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lpagliari
reviewed
Mar 8, 2018
src/node/utils/LibreOffice.js
Outdated
| if (type === 'doc') { | ||
| queue.push({ | ||
| "srcFile": srcFile, | ||
| "destFile": destFile.replace(/\.doc/, '.odt'), |
There was a problem hiding this comment.
I don't know if srcFile could be something like "test.html.html", but in this case this replace would not work as you're expecting. You can use the $ regex mark of EOL to fix that:
"test.html.html".replace(/\.html/, '.odt')
> "test.odt.html"
"test.html.html".replace(/\.html$/, '.odt')
> "test.html.odt"
src/node/utils/LibreOffice.js
Outdated
| "destFile": destFile.replace(/\.doc/, '.odt'), | ||
| "type": 'odt', | ||
| "callback": function () { | ||
| queue.push({"srcFile": srcFile.replace(/\.html/, '.odt'), "destFile": destFile, "type": type, "callback": callback}); |
src/node/utils/LibreOffice.js
Outdated
| @@ -35,7 +35,18 @@ var queue = async.queue(doConvertTask, 1); | |||
| * @param {Function} callback Standard callback function | |||
| */ | |||
| exports.convertFile = function(srcFile, destFile, type, callback) { | |||
| queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback}); | |||
| if (type === 'doc') { | |||
There was a problem hiding this comment.
as this is a very specific case, it would be good to have some comments explaining the reason we have this if/else. Would you mind adding it here, @ldidry ? You can add a reference to this PR, it would make it easier for other devs to know why this code needed to be added.
When using LibreOffice to convert pads to doc, we got `Error: no export filter for /tmp/xxxx.doc` (tested with LO 5 and 6). Maybe it's a regression from LO. Anyway, converting HTML to odt, then to doc works. Thx to lpagliari for her review!
|
Thank you for your suggestions, they're indeed very good 🙂 |
|
Thanks, @ldidry ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using LibreOffice to convert pads to doc, we got
Error: no export filter for /tmp/xxxx.doc(tested with LO 5 and 6). Maybe it's a regression from LO. Anyway, converting HTML to odt, then to doc works.