diff --git a/server/controllers/ReaderController.js b/server/controllers/ReaderController.js index 3d64e9a2..c2288ec7 100644 --- a/server/controllers/ReaderController.js +++ b/server/controllers/ReaderController.js @@ -1,6 +1,6 @@ const BaseController = require('./BaseController'); -const ReaderWorker = require('../core/ReaderWorker');//singleton -const ReaderStorage = require('../core/ReaderStorage');//singleton +const ReaderWorker = require('../core/Reader/ReaderWorker');//singleton +const ReaderStorage = require('../core/Reader/ReaderStorage');//singleton const WorkerState = require('../core/WorkerState');//singleton class ReaderController extends BaseController { diff --git a/server/core/BookConverter/ConvertBase.js b/server/core/Reader/BookConverter/ConvertBase.js similarity index 99% rename from server/core/BookConverter/ConvertBase.js rename to server/core/Reader/BookConverter/ConvertBase.js index e5abd389..3a0e6a0e 100644 --- a/server/core/BookConverter/ConvertBase.js +++ b/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; diff --git a/server/core/BookConverter/ConvertDoc.js b/server/core/Reader/BookConverter/ConvertDoc.js similarity index 100% rename from server/core/BookConverter/ConvertDoc.js rename to server/core/Reader/BookConverter/ConvertDoc.js diff --git a/server/core/BookConverter/ConvertDocX.js b/server/core/Reader/BookConverter/ConvertDocX.js similarity index 100% rename from server/core/BookConverter/ConvertDocX.js rename to server/core/Reader/BookConverter/ConvertDocX.js diff --git a/server/core/BookConverter/ConvertEpub.js b/server/core/Reader/BookConverter/ConvertEpub.js similarity index 100% rename from server/core/BookConverter/ConvertEpub.js rename to server/core/Reader/BookConverter/ConvertEpub.js diff --git a/server/core/BookConverter/ConvertFb2.js b/server/core/Reader/BookConverter/ConvertFb2.js similarity index 100% rename from server/core/BookConverter/ConvertFb2.js rename to server/core/Reader/BookConverter/ConvertFb2.js diff --git a/server/core/BookConverter/ConvertHtml.js b/server/core/Reader/BookConverter/ConvertHtml.js similarity index 100% rename from server/core/BookConverter/ConvertHtml.js rename to server/core/Reader/BookConverter/ConvertHtml.js diff --git a/server/core/BookConverter/ConvertMobi.js b/server/core/Reader/BookConverter/ConvertMobi.js similarity index 100% rename from server/core/BookConverter/ConvertMobi.js rename to server/core/Reader/BookConverter/ConvertMobi.js diff --git a/server/core/BookConverter/ConvertPdf.js b/server/core/Reader/BookConverter/ConvertPdf.js similarity index 99% rename from server/core/BookConverter/ConvertPdf.js rename to server/core/Reader/BookConverter/ConvertPdf.js index 77f1142c..0c2fdeaf 100644 --- a/server/core/BookConverter/ConvertPdf.js +++ b/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 { diff --git a/server/core/BookConverter/ConvertRtf.js b/server/core/Reader/BookConverter/ConvertRtf.js similarity index 100% rename from server/core/BookConverter/ConvertRtf.js rename to server/core/Reader/BookConverter/ConvertRtf.js diff --git a/server/core/BookConverter/ConvertSamlib.js b/server/core/Reader/BookConverter/ConvertSamlib.js similarity index 100% rename from server/core/BookConverter/ConvertSamlib.js rename to server/core/Reader/BookConverter/ConvertSamlib.js diff --git a/server/core/BookConverter/ConvertSites.js b/server/core/Reader/BookConverter/ConvertSites.js similarity index 100% rename from server/core/BookConverter/ConvertSites.js rename to server/core/Reader/BookConverter/ConvertSites.js diff --git a/server/core/BookConverter/index.js b/server/core/Reader/BookConverter/index.js similarity index 97% rename from server/core/BookConverter/index.js rename to server/core/Reader/BookConverter/index.js index 66657a25..ebb4c1da 100644 --- a/server/core/BookConverter/index.js +++ b/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 = [ diff --git a/server/core/BookConverter/sax.js b/server/core/Reader/BookConverter/sax.js similarity index 100% rename from server/core/BookConverter/sax.js rename to server/core/Reader/BookConverter/sax.js diff --git a/server/core/BookConverter/textUtils.js b/server/core/Reader/BookConverter/textUtils.js similarity index 100% rename from server/core/BookConverter/textUtils.js rename to server/core/Reader/BookConverter/textUtils.js diff --git a/server/core/ReaderStorage.js b/server/core/Reader/ReaderStorage.js similarity index 98% rename from server/core/ReaderStorage.js rename to server/core/Reader/ReaderStorage.js index d6e817b9..d3828102 100644 --- a/server/core/ReaderStorage.js +++ b/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; diff --git a/server/core/ReaderWorker.js b/server/core/Reader/ReaderWorker.js similarity index 95% rename from server/core/ReaderWorker.js rename to server/core/Reader/ReaderWorker.js index 59d3ab6d..ac2ea681 100644 --- a/server/core/ReaderWorker.js +++ b/server/core/Reader/ReaderWorker.js @@ -1,12 +1,13 @@ const fs = require('fs-extra'); const path = require('path'); -const WorkerState = require('./WorkerState');//singleton -const FileDownloader = require('./FileDownloader'); -const FileDecompressor = require('./FileDecompressor'); +const WorkerState = require('../WorkerState');//singleton +const FileDownloader = require('../FileDownloader'); +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;