From 15177d3fed87edb1f6a2da3066e0bc180a2f1255 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sat, 12 Jan 2019 00:33:58 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/ReaderWorker.js | 30 ++++++++++++++++++++++++++----
 server/core/readerLoader.js | 32 --------------------------------
 2 files changed, 26 insertions(+), 36 deletions(-)
 delete mode 100644 server/core/readerLoader.js

diff --git a/server/core/ReaderWorker.js b/server/core/ReaderWorker.js
index a641ae49..bc48554d 100644
--- a/server/core/ReaderWorker.js
+++ b/server/core/ReaderWorker.js
@@ -1,5 +1,11 @@
 const workerState = require('./workerState');
+const utils = require('./utils');
+
 const fs = require('fs-extra');
+const util = require('util');
+const stream = require('stream');
+const pipeline = util.promisify(stream.pipeline);
+const download = require('download');
 
 class ReaderWorker {
     constructor(config) {
@@ -9,10 +15,26 @@ class ReaderWorker {
     }
 
     async loadBook(url, wState) {
-        const loader = require('./readerLoader');
-        loader(url, this.config, (state) => {
-            wState.set(state)
-        });
+        const maxDownloadSize = 10*1024*1024;
+        let errMes = '';
+        try {
+            wState.set({state: 'download', step: 1, totalSteps: 3, url});
+
+            const tempFilename = utils.randomHexString(30);
+            const d = download(url);
+            d.on('downloadProgress', progress => {
+                wState.set({progress:  Math.round(progress.percent*100)});
+                if (progress.transferred > maxDownloadSize) {
+                    errMes = 'file too big';
+                    d.destroy();
+                }
+            });
+            await pipeline(d, fs.createWriteStream(`${this.config.tempDownloadDir}/${tempFilename}`));
+            
+            wState.finish({step: 3, file: tempFilename});
+        } catch (e) {
+            wState.set({state: 'error', error: (errMes ? errMes : e.message)});
+        }
     }
 
     loadBookUrl(url) {
diff --git a/server/core/readerLoader.js b/server/core/readerLoader.js
deleted file mode 100644
index 31b85c69..00000000
--- a/server/core/readerLoader.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const utils = require('./utils');
-
-const fs = require('fs-extra');
-const util = require('util');
-const stream = require('stream');
-const pipeline = util.promisify(stream.pipeline);
-const download = require('download');
-
-async function main(url, config, setState) {
-    const maxDownloadSize = 10*1024*1024;
-    let errMes = '';
-    try {
-        setState({state: 'download', step: 1, totalSteps: 3, url});
-
-        const tempFilename = utils.randomHexString(30);
-        const d = download(url);
-        d.on('downloadProgress', progress => {
-            setState({progress:  Math.round(progress.percent*100)});
-            if (progress.transferred > maxDownloadSize) {
-                errMes = 'file too big';
-                d.destroy();
-            }
-        });
-        await pipeline(d, fs.createWriteStream(`${config.tempDownloadDir}/${tempFilename}`));
-        
-        setState({state: 'finish', step: 3, file: tempFilename});
-    } catch (e) {
-        setState({state: 'error', error: (errMes ? errMes : e.message)});
-    }
-}
-
-module.exports = main;
\ No newline at end of file