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

[config] Turn on assemblyFormatAsOrigin by default

Browse Source
This commit is contained in:
Sergey Konovalov
2021-07-19 12:01:38 +03:00
parent 3160b04c12
commit 6d33229b38
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/config/default.json
View File

@ -120,7 +120,7 @@
"maxRequestChanges": 20000,
"openProtectedFile": true,
"editorDataStorage": "editorDataMemory",
"assemblyFormatAsOrigin": false
"assemblyFormatAsOrigin": true
},
"requestDefaults": {
"headers": {

4
DocService/sources/converterservice.js
View File

@ -97,7 +97,9 @@ function* getConvertPath(docId, fileTo, formatTo) {
return docId + '/' + fileTo;
}
function* getConvertUrl(baseUrl, fileToPath, title) {
title = path.basename(title, path.extname(title)) + path.extname(fileToPath);
if (title) {
title = path.basename(title, path.extname(title)) + path.extname(fileToPath);
}
return yield storage.getSignedUrl(baseUrl, fileToPath, commonDefines.c_oAscUrlTypes.Temporary, title);
}
function* convertByCmd(cmd, async, opt_fileTo, opt_taskExist, opt_priority, opt_expiration, opt_queue) {

2
FileConverter/sources/converter.js
View File

@ -580,7 +580,7 @@ function* postProcess(cmd, dataConvert, tempDirs, childRes, error, isTimeout) {
}
if (!existFile) {
//todo пересмотреть. загрулка в случае AVS_OFFICESTUDIO_FILE_OTHER_OOXML x2t меняет расширение у файла.
var fileToBasename = path.basename(dataConvert.fileTo);
var fileToBasename = path.basename(dataConvert.fileTo, path.extname(dataConvert.fileTo));
var fileToDir = path.dirname(dataConvert.fileTo);
var files = fs.readdirSync(fileToDir);
for (var i = 0; i < files.length; ++i) {