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

Рефакторинг

Browse Source
This commit is contained in:
Book Pauk
2019-03-01 15:10:01 +07:00
parent 759344bb34
commit 90a0882c59
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/BookConverter/index.js
View File

@@ -26,13 +26,6 @@ class BookConverter {
const selectedFileType = await this.detector.detectFile(inputFiles.selectedFile); const selectedFileType = await this.detector.detectFile(inputFiles.selectedFile);
const data = await fs.readFile(inputFiles.selectedFile); const data = await fs.readFile(inputFiles.selectedFile);
let selectedFileType2 = null;
let data2 = null;
if (inputFiles.nesting) {
selectedFileType2 = await this.detector.detectFile(inputFiles.nesting.selectedFile);
data2 = await fs.readFile(inputFiles.nesting.selectedFile);
}
let result = false; let result = false;
for (const convert of this.convertFactory) { for (const convert of this.convertFactory) {
result = await convert.run(data, {inputFiles, url, callback, dataType: selectedFileType}); result = await convert.run(data, {inputFiles, url, callback, dataType: selectedFileType});
@@ -40,14 +33,10 @@ class BookConverter {
await fs.writeFile(outputFile, result); await fs.writeFile(outputFile, result);
break; break;
} }
}
if (inputFiles.nesting) { if (!result && inputFiles.nesting) {
result = await convert.run(data2, {inputFiles: inputFiles.nesting, url, callback, dataType: selectedFileType2}); result = await this.convertToFb2(inputFiles.nesting, outputFile, url, callback);
if (result) {
await fs.writeFile(outputFile, result);
break;
}
}
} }
if (!result) { if (!result) {
@@ -59,6 +48,7 @@ class BookConverter {
} }
callback(100); callback(100);
return result;
} }
} }