Изменение путей к модулям

server/controllers/ReaderController.js

@@ -1,6 +1,6 @@
 const BaseController = require('./BaseController');
-const ReaderWorker = require('../core/ReaderWorker');//singleton
+const ReaderWorker = require('../core/Reader/ReaderWorker');//singleton
-const ReaderStorage = require('../core/ReaderStorage');//singleton
+const ReaderStorage = require('../core/Reader/ReaderStorage');//singleton
 const WorkerState = require('../core/WorkerState');//singleton
 
 class ReaderController extends BaseController {

server/core/Reader/BookConverter/ConvertBase.js

@@ -4,7 +4,7 @@ const chardet = require('chardet');
 const he = require('he');
 
 const textUtils = require('./textUtils');
-const utils = require('../utils');
+const utils = require('../../utils');
 
 let execConverterCounter = 0;
 

server/core/Reader/BookConverter/ConvertPdf.js

@@ -2,7 +2,7 @@ const fs = require('fs-extra');
 const path = require('path');
 
 const sax = require('./sax');
-const utils = require('../utils');
+const utils = require('../../utils');
 const ConvertHtml = require('./ConvertHtml');
 
 class ConvertPdf extends ConvertHtml {

server/core/Reader/BookConverter/index.js

@@ -1,5 +1,5 @@
 const fs = require('fs-extra');
-const FileDetector = require('../FileDetector');
+const FileDetector = require('../../FileDetector');
 
 //порядок важен
 const convertClassFactory = [

server/core/Reader/ReaderStorage.js

@@ -1,7 +1,7 @@
 const SQL = require('sql-template-strings');
 const _ = require('lodash');
 
-const ConnManager = require('../db/ConnManager');//singleton
+const ConnManager = require('../../db/ConnManager');//singleton
 
 let instance = null;
 

server/core/Reader/ReaderWorker.js

@@ -1,12 +1,13 @@
 const fs = require('fs-extra');
 const path = require('path');
 
-const WorkerState = require('./WorkerState');//singleton
+const WorkerState = require('../WorkerState');//singleton
-const FileDownloader = require('./FileDownloader');
+const FileDownloader = require('../FileDownloader');
-const FileDecompressor = require('./FileDecompressor');
+const FileDecompressor = require('../FileDecompressor');
 const BookConverter = require('./BookConverter');
-const utils = require('./utils');
+
-const log = new (require('./AppLogger'))().log;//singleton
+const utils = require('../utils');
+const log = new (require('../AppLogger'))().log;//singleton
 
 let instance = null;