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] Replace docbuilder options all-fonts-path and fonts-dir with check-fonts=0

Browse Source
This commit is contained in:
Sergey Konovalov
2022-07-21 18:23:22 +03:00
parent 2667d38acd
commit 18c28bd8da
7 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Common/config/default.json
View File

@ -287,8 +287,6 @@
"presentationThemesDir": "null",
"x2tPath": "null",
"docbuilderPath": "null",
"docbuilderAllFontsPath": "null",
"docbuilderCoreFontsPath": "",
"args": "",
"spawnOptions": {},
"errorfiles": "",

4
Common/config/development-linux.json
View File

@ -54,9 +54,7 @@
"fontDir": "/usr/share/fonts",
"presentationThemesDir": "../../sdkjs/slide/themes",
"x2tPath": "../FileConverter/bin/x2t",
"docbuilderPath": "../FileConverter/bin/docbuilder",
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../core-fonts"
"docbuilderPath": "../FileConverter/bin/docbuilder"
}
},
"SpellChecker": {

2
Common/config/development-mac.json
View File

@ -61,8 +61,6 @@
"presentationThemesDir": "../../sdkjs/slide/themes",
"x2tPath": "../FileConverter/bin/x2t",
"docbuilderPath": "../FileConverter/Bin/docbuilder",
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../core-fonts",
"errorfiles": "error"
}
},

2
Common/config/development-windows.json
View File

@ -61,8 +61,6 @@
"presentationThemesDir": "../../sdkjs/slide/themes",
"x2tPath": "../FileConverter/Bin/x2t.exe",
"docbuilderPath": "../FileConverter/Bin/docbuilder.exe",
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../core-fonts",
"errorfiles": "error"
}
},

4
Common/config/production-linux.json
View File

@ -63,9 +63,7 @@
"fontDir": "/usr/share/fonts",
"presentationThemesDir": "/var/www/onlyoffice/documentserver/sdkjs/slide/themes",
"x2tPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/x2t",
"docbuilderPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/docbuilder",
"docbuilderAllFontsPath": "/var/lib/onlyoffice/documentserver/App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "/var/www/onlyoffice/documentserver/core-fonts"
"docbuilderPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/docbuilder"
}
},
"SpellChecker": {

4
Common/config/production-windows.json
View File

@ -59,9 +59,7 @@
"fontDir": "",
"presentationThemesDir": "../../sdkjs/slide/themes",
"x2tPath": "../FileConverter/bin/x2t.exe",
"docbuilderPath": "../FileConverter/bin/docbuilder.exe",
"docbuilderAllFontsPath": "../App_Data/docbuilder/AllFonts.js",
"docbuilderCoreFontsPath": "../../core-fonts"
"docbuilderPath": "../FileConverter/bin/docbuilder.exe"
}
},
"SpellChecker": {

7
FileConverter/sources/converter.js
View File

@ -62,8 +62,6 @@ var cfgFontDir = configConverter.get('fontDir');
var cfgPresentationThemesDir = configConverter.get('presentationThemesDir');
var cfgX2tPath = configConverter.get('x2tPath');
var cfgDocbuilderPath = configConverter.get('docbuilderPath');
var cfgDocbuilderAllFontsPath = configConverter.get('docbuilderAllFontsPath');
var cfgDocbuilderCoreFontsPath = configConverter.get('docbuilderCoreFontsPath');
var cfgArgs = configConverter.get('args');
var cfgSpawnOptions = configConverter.get('spawnOptions');
if (cfgSpawnOptions.env) {
@ -680,10 +678,7 @@ function* spawnProcess(isBuilder, tempDirs, dataConvert, authorProps, getTaskTim
} else {
fs.mkdirSync(path.join(tempDirs.result, 'output'));
processPath = cfgDocbuilderPath;
childArgs.push('--all-fonts-path=' + cfgDocbuilderAllFontsPath);
if (cfgDocbuilderCoreFontsPath) {
childArgs.push('--fonts-dir=' + cfgDocbuilderCoreFontsPath);
}
childArgs.push('--check-fonts=0');
childArgs.push('--save-use-only-names=' + tempDirs.result + '/output');
childArgs.push(dataConvert.fileFrom);
}