deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлен abort конвертеров при истечении времени ожидания подвижек очереди

Browse Source
This commit is contained in:
Book Pauk
2020-01-27 19:34:10 +07:00
parent f8b7b8b698
commit 57fc64af79
10 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/Reader/BookConverter/ConvertDoc.js
View File

@@ -16,7 +16,7 @@ class ConvertDoc extends ConvertDocX {
return false;
await this.checkExternalConverterPresent();
const {inputFiles, callback} = opts;
const {inputFiles, callback, abort} = opts;
const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
const docFile = `${outFile}.doc`;
@@ -24,9 +24,9 @@ class ConvertDoc extends ConvertDocX {
const fb2File = `${outFile}.fb2`;
await fs.copy(inputFiles.sourceFile, docFile);
await this.execConverter(this.sofficePath, ['--headless', '--convert-to', 'docx', '--outdir', inputFiles.filesDir, docFile]);
await this.execConverter(this.sofficePath, ['--headless', '--convert-to', 'docx', '--outdir', inputFiles.filesDir, docFile], null, abort);
return await super.convert(docxFile, fb2File, callback);
return await super.convert(docxFile, fb2File, callback, abort);
}
}