pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-02-10 18:05:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[feature] Parse body from 'savefromorigin' request. For downloadAs pdf with changes

Browse Source
This commit is contained in:
Sergey Konovalov
2023-10-06 13:46:01 +03:00
parent ec588be85d
commit 8ae7d85bad
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DocService/sources/canvasservice.js
View File

@ -348,12 +348,14 @@ function* saveParts(ctx, cmd, filename) {
}
if (cmd.getUrl()) {
result = true;
} else {
} else if (cmd.getData() && cmd.getData().length > 0) {
var buffer = cmd.getData();
yield storage.putObject(ctx, cmd.getSaveKey() + '/' + filename, buffer, buffer.length);
//delete data to prevent serialize into json
cmd.data = null;
result = (SAVE_TYPE_COMPLETE_ALL === saveType || SAVE_TYPE_COMPLETE === saveType);
} else {
result = true;
}
return result;
}
@ -826,14 +828,16 @@ function* commandPathUrl(ctx, conn, cmd, outputData) {
}
}
function* commandSaveFromOrigin(ctx, cmd, outputData, password) {
let docPassword = sqlBase.DocumentPassword.prototype.getDocPassword(ctx, password);
if (docPassword.initial) {
cmd.setPassword(docPassword.initial);
var completeParts = yield* saveParts(ctx, cmd, "changes0.json");
if (completeParts) {
let docPassword = sqlBase.DocumentPassword.prototype.getDocPassword(ctx, password);
if (docPassword.initial) {
cmd.setPassword(docPassword.initial);
}
var queueData = getSaveTask(ctx, cmd);
queueData.setFromOrigin(true);
yield* docsCoServer.addTask(queueData, constants.QUEUE_PRIORITY_LOW);
}
yield* addRandomKeyTaskCmd(ctx, cmd);
var queueData = getSaveTask(ctx, cmd);
queueData.setFromOrigin(true);
yield* docsCoServer.addTask(queueData, constants.QUEUE_PRIORITY_LOW);
outputData.setStatus('ok');
outputData.setData(cmd.getSaveKey());
}

37
FileConverter/sources/converter.js
View File

@ -409,19 +409,29 @@ function* downloadFileFromStorage(ctx, strPath, dir, opt_specialDir) {
var data = yield storage.getObject(ctx, file, opt_specialDir);
fs.writeFileSync(path.join(dir, fileRel), data);
}
return list.length;
}
function* processDownloadFromStorage(ctx, dataConvert, cmd, task, tempDirs, authorProps) {
const tenEditor = ctx.getCfg('services.CoAuthoring.editor', cfgEditor);
let res = constants.NO_ERROR;
let needConcatFiles = false;
let concatDir;
let concatTemplate;
if (task.getFromOrigin() || task.getFromSettings()) {
let changesDir = path.join(tempDirs.source, constants.CHANGES_NAME);
fs.mkdirSync(changesDir);
let filesCount = yield* downloadFileFromStorage(ctx, cmd.getSaveKey(), changesDir);
if (filesCount > 0) {
concatDir = changesDir;
concatTemplate = "changes0";
task.setFromChanges(true);
}
dataConvert.fileFrom = path.join(tempDirs.source, 'origin.' + cmd.getFormat());
} else {
//overwrite some files from m_sKey (for example Editor.bin or changes)
yield* downloadFileFromStorage(ctx, cmd.getSaveKey(), tempDirs.source);
let format = cmd.getFormat() || 'bin';
dataConvert.fileFrom = path.join(tempDirs.source, 'Editor.' + format);
needConcatFiles = true;
concatDir = tempDirs.source;
}
if (!utils.checkPathTraversal(ctx, dataConvert.key, tempDirs.source, dataConvert.fileFrom)) {
return constants.CONVERT_PARAMS;
@ -430,12 +440,20 @@ function* processDownloadFromStorage(ctx, dataConvert, cmd, task, tempDirs, auth
let mailMergeSend = cmd.getMailMergeSend();
if (mailMergeSend) {
yield* downloadFileFromStorage(ctx, mailMergeSend.getJsonKey(), tempDirs.source);
needConcatFiles = true;
concatDir = tempDirs.source;
}
if (needConcatFiles) {
yield* concatFiles(tempDirs.source);
if (concatDir) {
yield* concatFiles(concatDir, concatTemplate);
if (concatTemplate) {
let filenames = fs.readdirSync(concatDir);
filenames.forEach(file => {
if (file.match(new RegExp(`${concatTemplate}\\d+\\.`))) {
fs.rmSync(path.join(concatDir, file));
}
});
}
}
if (task.getFromChanges()) {
if (task.getFromChanges() && !(task.getFromOrigin() || task.getFromSettings())) {
if(tenEditor['binaryChanges']) {
res = yield* processChangesBin(ctx, tempDirs, task, cmd, authorProps);
} else {
@ -458,15 +476,16 @@ function* processDownloadFromStorage(ctx, dataConvert, cmd, task, tempDirs, auth
return res;
}
function* concatFiles(source) {
function* concatFiles(source, template) {
template = template || "Editor";
//concatenate EditorN.ext parts in Editor.ext
let list = yield utils.listObjects(source, true);
list.sort(utils.compareStringByLength);
let writeStreams = {};
for (let i = 0; i < list.length; ++i) {
let file = list[i];
if (file.match(/Editor\d+\./)) {
let target = file.replace(/(Editor)\d+(\..*)/, '$1$2');
if (file.match(new RegExp(`${template}\\d+\\.`))) {
let target = file.replace(new RegExp(`(${template})\\d+(\\..*)`), '$1$2');
let writeStream = writeStreams[target];
if (!writeStream) {
writeStream = yield utils.promiseCreateWriteStream(target);