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-10-28 23:30:02 +07:00
parent b64985349e
commit 9ebdbc81d0
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/controllers/ReaderController.js
View File

@@ -1,12 +1,13 @@
const BaseController = require('./BaseController');
const ReaderWorker = require('../core/ReaderWorker');
const readerStorage = require('../core/readerStorage');
const workerState = require('../core/workerState');
const WorkerState = require('../core/WorkerState');//singleton
class ReaderController extends BaseController {
constructor(config) {
super(config);
this.readerWorker = new ReaderWorker(config);
this.workerState = new WorkerState();
}
async loadBook(req, res) {
@@ -19,7 +20,7 @@ class ReaderController extends BaseController {
url: request.url,
enableSitesFilter: (request.hasOwnProperty('enableSitesFilter') ? request.enableSitesFilter : true)
});
const state = workerState.getState(workerId);
const state = this.workerState.getState(workerId);
return (state ? state : {});
} catch (e) {
error = e.message;

9
server/controllers/WorkerController.js
View File

@@ -1,7 +1,12 @@
const BaseController = require('./BaseController');
const workerState = require('../core/workerState');
const WorkerState = require('../core/WorkerState');//singleton
class WorkerController extends BaseController {
constructor(config) {
super(config);
this.workerState = new WorkerState();
}
async getState(req, res) {
const request = req.body;
let error = '';
@@ -9,7 +14,7 @@ class WorkerController extends BaseController {
if (!request.workerId)
throw new Error(`key 'workerId' is wrong`);
const state = workerState.getState(request.workerId);
const state = this.workerState.getState(request.workerId);
return (state ? state : {});
} catch (e) {
error = e.message;