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

9
server/core/Reader/BookConverter/index.js
View File

@@ -26,11 +26,14 @@ class BookConverter {
}
}
async convertToFb2(inputFiles, outputFile, opts, callback) {
async convertToFb2(inputFiles, outputFile, opts, callback, abort) {
if (abort && abort())
throw new Error('abort');
const selectedFileType = await this.detector.detectFile(inputFiles.selectedFile);
const data = await fs.readFile(inputFiles.selectedFile);
const convertOpts = Object.assign({}, opts, {inputFiles, callback, dataType: selectedFileType});
const convertOpts = Object.assign({}, opts, {inputFiles, callback, abort, dataType: selectedFileType});
let result = false;
for (const convert of this.convertFactory) {
result = await convert.run(data, convertOpts);
@@ -41,7 +44,7 @@ class BookConverter {
}
if (!result && inputFiles.nesting) {
result = await this.convertToFb2(inputFiles.nesting, outputFile, opts, callback);
result = await this.convertToFb2(inputFiles.nesting, outputFile, opts, callback, abort);
}
if (!result) {