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

2020-01-27 19:34:10 +07:00
parent f8b7b8b698
commit 57fc64af79
10 changed files with 42 additions and 29 deletions
--- a/server/core/Reader/BookConverter/ConvertEpub.js
+++ b/server/core/Reader/BookConverter/ConvertEpub.js
@@ -28,7 +28,7 @@ class ConvertEpub extends ConvertBase {
            return false;
        await this.checkExternalConverterPresent();

-        const {inputFiles, callback} = opts;
+        const {inputFiles, callback, abort} = opts;

        const outFile = `${inputFiles.filesDir}/${path.basename(inputFiles.sourceFile)}`;
        const epubFile = `${outFile}.epub`;
@@ -40,7 +40,7 @@ class ConvertEpub extends ConvertBase {
        await this.execConverter(this.calibrePath, [epubFile, fb2File], () => {
            perc = (perc < 100 ? perc + 5 : 50);
            callback(perc);
-        });
+        }, abort);

        return await fs.readFile(fb2File);
    }